X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=bin%2Fapache.export;h=47863a9d56d5b4005879f1ee57e0255c4b67e800;hp=6142c92b461b9bd5e624ced5d123cf5687cd8ff1;hb=fdfdba16902b3967a9f6deb955e9c6885419bc79;hpb=9aec22e5fd00800c6e7952ae5b85cc639d4b1e78

diff --git a/bin/apache.export b/bin/apache.export
index 6142c92b4..47863a9d5 100755
--- a/bin/apache.export
+++ b/bin/apache.export
@@ -39,11 +39,11 @@ foreach my $export ( @exports ) {
     use vars qw($zone $username);
     $zone = $svc_www->domain_record->zone;
     $username = $svc_www->svc_acct->username;
-    print HTTPD_CONF eval(qq("$template"));
+    print HTTPD_CONF eval(qq("$template")). "\n\n";
   }
 
   my $user = $export->option('user');
-  my $httpd_conf = $export->option('httpd_conf')
+  my $httpd_conf = $export->option('httpd_conf');
 
   $rsync->exec( {
     src       => $file,
@@ -51,15 +51,17 @@ foreach my $export ( @exports ) {
   } ) or die "rsync to $machine failed: ". join(" / ", $rsync->err);
  # warn $rsync->out;
 
-  ssh("root\@$machine", 'ndc reload');
+  my $restart = $export->option('restart') || 'apachectl graceful';
+
+  ssh("root\@$machine", $restart);
 
 }
 
-close NAMED_CONF;
+close HTTPD_CONF;
 
 # -----
 
 sub usage {
-  die "Usage:\n  export.export user\n"; 
+  die "Usage:\n  apache.export user\n"; 
 }