improve behavior of != operator

[freeside.git] / bin / apache.export

diff --git a/bin/apache.export b/bin/apache.export
index d1ee9e7..02dd58a 100755 (executable)
--- a/bin/apache.export
+++ b/bin/apache.export
@@ -30,25 +30,37 @@ my $rsync = File::Rsync->new({
 
 foreach my $export ( @exports ) {
 
-  my $machine = $export->machine;
-  my $file = "$spooldir/$machine.conf";
+  my $machine   = $export->machine;
+  my $exportnum = $export->exportnum;
+  my $file = "$spooldir/$machine.exportnum$exportnum.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');
-
   my @svc_www = $export->svc_x;
 
   foreach my $svc_www ( @svc_www ) {
     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;
+    my $template = $export->option('template');
+    my $cust_pkg = $svc_www->cust_svc->cust_pkg;
+    if ( $cust_pkg->getfield('susp') or $cust_pkg->getfield('cancel') ) {
+      $template = $export->option('template_inactive') 
+                  || $export->option('template');
+      # Fall back to the regular template if template_inactive doesn't exist
+    }
+    if ( $svc_www->svc_acct ) {
+      $username = $svc_www->svc_acct->username;
+      $dir = $svc_www->svc_acct->dir;
+      $email = $svc_www->svc_acct->email;
+    } else {
+      $username = '';
+      $dir      = '';
+      $email    = '';
+    }
 
     warn "  adding configuration section for $zone\n"
       if $opt{d};