X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=bin%2Fapache.export;h=02dd58a2dae2d4cb7f8b75ecbebcf9bf8d9118af;hp=da2d73c1cfe6e6bc98e4dbbaa1d43593751fad38;hb=d5109b4395d35a615f36fc7629803c24d489c516;hpb=c648976f0b7975f2328ebd7ba8c711fad0ca4195

diff --git a/bin/apache.export b/bin/apache.export
index da2d73c1c..02dd58a2d 100755
--- a/bin/apache.export
+++ b/bin/apache.export
@@ -30,22 +30,28 @@ 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;
     $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;