X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=bin%2Fapache.export;h=b39b5f1a2ae5f71eb9e903f28ac66c3219b176e3;hb=8a507f43bfa5c5232b5babfbbf82ac5de5702add;hp=f0a6beefc950bab926f82ddd5af52d50233d0d32;hpb=be0c6c490ff51286e521e838ceafb1cf7ec2aa5a;p=freeside.git

diff --git a/bin/apache.export b/bin/apache.export
index f0a6beefc..b39b5f1a2 100755
--- a/bin/apache.export
+++ b/bin/apache.export
@@ -36,9 +36,12 @@ foreach my $export ( @exports ) {
   my @svc_www = $export->svc_x;
 
   foreach my $svc_www ( @svc_www ) {
-    use vars qw($zone $username);
+    use vars qw($zone $username $dir $email $config);
     $zone = $svc_www->domain_record->zone;
     $username = $svc_www->svc_acct->username;
+    $dir = $svc_www->svc_acct->dir;
+    $email = $svc_www->svc_acct->email;
+    $config = $svc_www->config;
     print HTTPD_CONF eval(qq("$template")). "\n\n";
   }
 
@@ -51,7 +54,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);
 
 }