Commit dede658b authored by Kirk Webb's avatar Kirk Webb

Fixed up ops-install for new way of handling smb.conf file.  We copy in an
smb.conf.head file now, and copy that to smb.conf initially on ops.
exports_setup[.proxy] takes care of updating the share permissions for
samba dynamically.
parent a05d2fae
......@@ -2177,7 +2177,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
cdrom/groklilo/GNUmakefile \
dhcpd/dhcpd.conf.template dhcpd/GNUmakefile \
install/GNUmakefile install/ops-install install/boss-install \
install/newnode_sshkeys/GNUmakefile install/smb.conf \
install/newnode_sshkeys/GNUmakefile install/smb.conf.head \
mote/GNUmakefile mote/tbuisp mote/tbsgmotepower \
robots/GNUmakefile robots/tbsetdest/GNUmakefile \
robots/mtp/GNUmakefile robots/emc/GNUmakefile \
......
......@@ -760,7 +760,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
cdrom/groklilo/GNUmakefile \
dhcpd/dhcpd.conf.template dhcpd/GNUmakefile \
install/GNUmakefile install/ops-install install/boss-install \
install/newnode_sshkeys/GNUmakefile install/smb.conf \
install/newnode_sshkeys/GNUmakefile install/smb.conf.head \
mote/GNUmakefile mote/tbuisp mote/tbsgmotepower \
robots/GNUmakefile robots/tbsetdest/GNUmakefile \
robots/mtp/GNUmakefile robots/emc/GNUmakefile \
......
......@@ -124,7 +124,8 @@ my $SUDOERS = "/usr/local/etc/sudoers";
my $SSHD_CONFIG = "/etc/ssh/sshd_config";
my $CRONTAB = "/etc/crontab";
my $AUTHKEYS = "/root/.ssh/authorized_keys";
my $SMBCONF = "/usr/local/etc/smb.conf";
my $SMBCONF_FILE = "/usr/local/etc/smb.conf";
my $SMBCONF_HEAD = "$SMBCONF_FILE.head";
#
# Some directories we care about
......@@ -477,11 +478,12 @@ Phase "sudoers", "Editing $SUDOERS", sub {
if ($WINSUPPORT) {
Phase "samba", "Setting up Samba", sub {
Phase "smb.conf", "Installing smb.conf", sub {
DoneIfEdited($SMBCONF);
ExecQuietFatal("$CP -pf $TOP_OBJDIR/install/smb.conf $SMBCONF");
AppendToFileFatal($SMBCONF,
Phase "smb.conf", "Installing smb.conf[.head]", sub {
DoneIfEdited($SMBCONF_HEAD);
ExecQuietFatal("$CP -pf $TOP_OBJDIR/install/smb.conf.head $SMBCONF_HEAD");
AppendToFileFatal($SMBCONF_HEAD,
"# This file created by Emulab Control");
ExecQuietFatal("$CP -pf $SMBCONF_HEAD $SMBCONF_FILE");
};
Phase "samba.sh", "Installing samba.sh", sub {
DoneIfExists("$RCDIR/samba.sh");
......
......@@ -18,7 +18,9 @@
[global]
# workgroup = NT-Domain-Name or Workgroup-Name, eg: REDHAT4
workgroup = @OURDOMAIN@
# XXX: This really ought to be the real elab domain, but we don't (yet)
# know how to change the workgroup programatically on a Windoze box.
workgroup = EMULAB
# server string is the equivalent of the NT Description field
server string = Emulab Samba Server
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment