summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--FS/FS/part_export/apache.pm3
-rwxr-xr-xbin/apache.export4
2 files changed, 6 insertions, 1 deletions
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);
}