[freeside-commits] freeside/bin apache.export,1.6.4.2,1.6.4.3

[Ivan,,,]

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

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	apache.export 
Log Message:
apache export: don't bomb out when svc_www records aren't associated with an svc_acct, just leave those subsitution vars blank

Index: apache.export
===================================================================
RCS file: /home/cvs/cvsroot/freeside/bin/apache.export,v
retrieving revision 1.6.4.2
retrieving revision 1.6.4.3
diff -u -d -r1.6.4.2 -r1.6.4.3
--- apache.export	12 Jul 2007 21:41:10 -0000	1.6.4.2
+++ apache.export	20 Jul 2007 19:58:35 -0000	1.6.4.3
@@ -45,10 +45,16 @@
   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;
+    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};