From: ivan <ivan>
Date: Thu, 6 May 2004 22:29:24 +0000 (+0000)
Subject: add option to change the restart command in apache exports
X-Git-Tag: BEFORE_FINAL_MASONIZE~1113
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=226b17bfa055fb960b722c6a17d1c81bb8970f2c

add option to change the restart command in apache exports
---

diff --git a/FS/FS/part_export/apache.pm b/FS/FS/part_export/apache.pm
index b16b3040d..17fbabff8 100644
--- a/FS/FS/part_export/apache.pm
+++ b/FS/FS/part_export/apache.pm
@@ -10,6 +10,9 @@ tie my %options, 'Tie::IxHash',
   'user'       => { label=>'Remote username', default=>'root' },
   'httpd_conf' => { label=>'httpd.conf snippet location',
                     default=>'/etc/apache/httpd-freeside.conf', },
+  'restart'    => { label=>'Apache restart command',
+                    default=>'apachectl graceful',
+                  },
   'template'   => {
     label   => 'Template',
     type    => 'textarea',
diff --git a/bin/apache.export b/bin/apache.export
index f0a6beefc..47863a9d5 100755
--- a/bin/apache.export
+++ b/bin/apache.export
@@ -51,7 +51,9 @@ foreach my $export ( @exports ) {
   } ) or die "rsync to $machine failed: ". join(" / ", $rsync->err);
  # warn $rsync->out;
 
-  ssh("root\@$machine", 'apachectl graceful');
+  my $restart = $export->option('restart') || 'apachectl graceful';
+
+  ssh("root\@$machine", $restart);
 
 }