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

diff --git a/bin/apache.export b/bin/apache.export
index 124a3c5bf..02dd58a2d 100755
--- a/bin/apache.export
+++ b/bin/apache.export
@@ -39,22 +39,19 @@ foreach my $export ( @exports ) {
 
   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;
+    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');
+      $template = $export->option('template_inactive') 
+                  || $export->option('template');
+      # Fall back to the regular template if template_inactive doesn't exist
     }
-    # Use the regular template if the pkg is live
-    # or if template_inactive doesn't exist.
-    $template ||= $export->option('template');
     if ( $svc_www->svc_acct ) {
       $username = $svc_www->svc_acct->username;
       $dir = $svc_www->svc_acct->dir;