projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
webdemo UI
[freeside.git]
/
bin
/
apache.export
diff --git
a/bin/apache.export
b/bin/apache.export
index
d1ee9e7
..
82eb6d6
100755
(executable)
--- a/
bin/apache.export
+++ b/
bin/apache.export
@@
-30,8
+30,9
@@
my $rsync = File::Rsync->new({
foreach my $export ( @exports ) {
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};
warn "exporting apache configuration for $machine to $file\n"
if $opt{d};
@@
-45,10
+46,16
@@
foreach my $export ( @exports ) {
foreach my $svc_www ( @svc_www ) {
use vars qw($zone $username $dir $email $config);
$zone = $svc_www->domain_record->zone;
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;
$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};
warn " adding configuration section for $zone\n"
if $opt{d};