From: ivan <ivan>
Date: Thu, 12 Jul 2007 21:41:09 +0000 (+0000)
Subject: add debugging flag to apache export
X-Git-Tag: TRIXBOX_2_6~457
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=9071929765c4b63a600c95bb2c2a2c7851a41377

add debugging flag to apache export
---

diff --git a/bin/apache.export b/bin/apache.export
index b39b5f1a2..d1ee9e78c 100755
--- a/bin/apache.export
+++ b/bin/apache.export
@@ -1,6 +1,7 @@
 #!/usr/bin/perl -w
 
 use strict;
+use Getopt::Std;
 #use File::Path;
 use File::Rsync;
 use Net::SSH qw(ssh);
@@ -10,6 +11,9 @@ use FS::part_export;
 use FS::cust_svc;
 use FS::svc_www;
 
+use vars qw(%opt);
+getopts("d", \%opt);
+
 my $user = shift or die &usage;
 adminsuidsetup $user;
 
@@ -29,6 +33,9 @@ foreach my $export ( @exports ) {
   my $machine = $export->machine;
   my $file = "$spooldir/$machine.conf";
 
+  warn "exporting apache configuration for $machine to $file\n"
+    if $opt{d};
+
   open(HTTPD_CONF,">$file") or die "can't open $file: $!";
 
   my $template = $export->option('template');
@@ -42,12 +49,19 @@ foreach my $export ( @exports ) {
     $dir = $svc_www->svc_acct->dir;
     $email = $svc_www->svc_acct->email;
     $config = $svc_www->config;
+
+    warn "  adding configuration section for $zone\n"
+      if $opt{d};
+
     print HTTPD_CONF eval(qq("$template")). "\n\n";
   }
 
   my $user = $export->option('user');
   my $httpd_conf = $export->option('httpd_conf');
 
+  warn "syncing $file to $httpd_conf on $machine\n"
+    if $opt{d};
+
   $rsync->exec( {
     src       => $file,
     dest      => "$user\@$machine:$httpd_conf",
@@ -56,6 +70,9 @@ foreach my $export ( @exports ) {
 
   my $restart = $export->option('restart') || 'apachectl graceful';
 
+  warn "running restart command $restart on $machine\n"
+    if $opt{d};
+
   ssh("root\@$machine", $restart);
 
 }
@@ -65,6 +82,6 @@ close HTTPD_CONF;
 # -----
 
 sub usage {
-  die "Usage:\n  apache.export user\n"; 
+  die "Usage:\n  apache.export [ -d ] user\n"; 
 }