added sendmailrestart and sendmailconfigpath config files

3 files changed, 22 insertions, 12 deletions

diff --git a/TODO b/TODO
index 0e5c89bb9..0d16f157a 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.46 2000-06-27 12:15:50 ivan Exp $
+$Id: TODO,v 1.47 2000-07-03 09:03:14 ivan Exp $
 
 If you are interested in helping with any of these, please join the mailing
 list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
@@ -6,6 +6,9 @@ duplication of effort.
 
 ---
 
+Bug: during the linking process apparantly you can link too many services to 
+a package.  *sigh*
+
 zip code i18n is not very good :( but at least US, CA, HU, ?
 
 ut_phonen doesn't check data length.  several
diff --git a/bin/svc_acct_sm.export b/bin/svc_acct_sm.export
index 8a38f5d54..0893c94df 100755
--- a/bin/svc_acct_sm.export
+++ b/bin/svc_acct_sm.export
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_sm.export,v 1.4 2000-06-29 14:02:29 ivan Exp $
+# $Id: svc_acct_sm.export,v 1.5 2000-07-03 09:03:14 ivan Exp $
 # 
 # Create and export config files for sendmail, qmail
 #
@@ -42,7 +42,10 @@
 # /var/spool/freeside/conf and sendmail updates ivan@sisd.com 98-aug-14
 #
 # $Log: svc_acct_sm.export,v $
-# Revision 1.4  2000-06-29 14:02:29  ivan
+# Revision 1.5  2000-07-03 09:03:14  ivan
+# added sendmailrestart and sendmailconfigpath config files
+#
+# Revision 1.4  2000/06/29 14:02:29  ivan
 # add sendmailrestart configuration file
 #
 # Revision 1.3  2000/06/12 08:37:56  ivan
@@ -67,15 +70,18 @@ adminsuidsetup $user;
 
 $conf = new FS::Conf;
 
-my($shellmachine);
-my(@qmailmachines);
+my($shellmachine, @qmailmachines);
 if ( $conf->exists('qmailmachines') ) {
   $shellmachine = $conf->config('shellmachine');
   @qmailmachines = $conf->config('qmailmachines');
 }
 
-my @sendmailmachines = $conf->config('sendmailmachines')
-  if $conf->exists('sendmailmachines');
+my(@sendmailmachines, $sendmailconfigpath, $sendmailrestart);
+if $conf->exists('sendmailmachines') {
+  @sendmailmachines = $conf->config('sendmailmachines');
+  $sendmailconfigpath = $conf->config('sendmailconfigpath') || '/etc';
+  $sendmailrestart = $conf->config('sendmailrestart');
+}
 
 my $mydomain = $conf->config('domain');
 
@@ -186,15 +192,15 @@ close VIRTUALDOMAINS;
 
 my($sendmailmachine);
 foreach $sendmailmachine (@sendmailmachines) {
-  scp("$spooldir/sendmail.cw","root\@$sendmailmachine:/etc/sendmail.cw.new")
+  scp("$spooldir/sendmail.cw","root\@$sendmailmachine:$sendmailconfigpath/sendmail.cw.new")
     == 0 or die "scp error: $!";
-  scp("$spooldir/virtusertable","root\@$sendmailmachine:/etc/virtusertable.new")
+  scp("$spooldir/virtusertable","root\@$sendmailmachine:$sendmailconfigpath/virtusertable.new")
     == 0 or die "scp error: $!";
   ssh("root\@$sendmailmachine",
     "( ".
-      "mv /etc/sendmail.cw.new /etc/sendmail.cw; ".
-      "mv /etc/virtusertable.new /etc/virtusertable; ".
-      #"/etc/init.d/sendmail restart; ".
+      "mv $sendmailconfigpath/sendmail.cw.new $sendmailconfigpath/sendmail.cw; ".
+      "mv $sendmailconfigpath/virtusertable.new $sendmailconfigpath/virtusertable; ".
+      $sendmailrestart.
     " )"
   )
     == 0 or die "ssh error: $!";
diff --git a/htdocs/docs/config.html b/htdocs/docs/config.html
index 5aa9c66fd..c824b74c8 100644
--- a/htdocs/docs/config.html
+++ b/htdocs/docs/config.html
@@ -61,6 +61,7 @@ All further configuration files and directories are located in
           <li>registries/internic/to - Email address to which InterNIC domain registrations are sent.
         </ul>
     </ul>
+  <li>sendmailconfigpath - Sendmail configuration file path - defaults to `/etc'.  Many newer distributions use `/etc/mail'.
   <li>sendmailmachines - Your sendmail machines, one per line.  This enables export of `/etc/virtusertable' and `/etc/sendmail.cw'.
   <li>sendmailrestart - If defined, the command which is run on sendmail machines after files are copied.
   <li>shellmachine - A single machine with user home directories mounted.  This enables home directory creation, renaming and archiving/deletion.  In conjunction with `qmailmachines', it also enables `.qmail-extension' file maintenance.