[freeside-commits] freeside/bin apache.export,1.7,1.8

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/bin
In directory wavetail:/tmp/cvs-serv7388

Modified Files:
	apache.export 
Log Message:
add debugging flag to apache export

Index: apache.export
===================================================================
RCS file: /home/cvs/cvsroot/freeside/bin/apache.export,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- apache.export	1 Apr 2007 02:45:28 -0000	1.7
+++ apache.export	12 Jul 2007 21:41:09 -0000	1.8
@@ -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::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 @@
   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 @@
     $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 @@
 
   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 @@
 # -----
 
 sub usage {
-  die "Usage:\n  apache.export user\n"; 
+  die "Usage:\n  apache.export [ -d ] user\n"; 
 }