[freeside-commits] freeside/bin apache.export,1.11,1.12

Mark Wells mark at wavetail.420.am
Thu Jun 10 21:44:34 PDT 2010


Update of /home/cvs/cvsroot/freeside/bin
In directory wavetail.420.am:/tmp/cvs-serv19220/bin

Modified Files:
	apache.export 
Log Message:
fix my mistake

Index: apache.export
===================================================================
RCS file: /home/cvs/cvsroot/freeside/bin/apache.export,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -d -r1.11 -r1.12
--- apache.export	11 Jun 2010 04:14:23 -0000	1.11
+++ apache.export	11 Jun 2010 04:44:32 -0000	1.12
@@ -47,14 +47,6 @@
     use vars qw($zone $username $dir $email $config);
     $zone = $svc_www->domain_record->zone;
     $config = $svc_www->config;
-    my $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');
-    }
-    # 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;



More information about the freeside-commits mailing list