projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add price plan to bill on internal or external CDRs directly, add option to export...
[freeside.git]
/
bin
/
apache.export
diff --git
a/bin/apache.export
b/bin/apache.export
index
6142c92
..
47863a9
100755
(executable)
--- a/
bin/apache.export
+++ b/
bin/apache.export
@@
-39,11
+39,11
@@
foreach my $export ( @exports ) {
use vars qw($zone $username);
$zone = $svc_www->domain_record->zone;
$username = $svc_www->svc_acct->username;
use vars qw($zone $username);
$zone = $svc_www->domain_record->zone;
$username = $svc_www->svc_acct->username;
- print HTTPD_CONF eval(qq("$template"));
+ print HTTPD_CONF eval(qq("$template"))
. "\n\n"
;
}
my $user = $export->option('user');
}
my $user = $export->option('user');
- my $httpd_conf = $export->option('httpd_conf')
+ my $httpd_conf = $export->option('httpd_conf')
;
$rsync->exec( {
src => $file,
$rsync->exec( {
src => $file,
@@
-51,15
+51,17
@@
foreach my $export ( @exports ) {
} ) or die "rsync to $machine failed: ". join(" / ", $rsync->err);
# warn $rsync->out;
} ) or die "rsync to $machine failed: ". join(" / ", $rsync->err);
# warn $rsync->out;
- ssh("root\@$machine", 'ndc reload');
+ my $restart = $export->option('restart') || 'apachectl graceful';
+
+ ssh("root\@$machine", $restart);
}
}
-close
NAME
D_CONF;
+close
HTTP
D_CONF;
# -----
sub usage {
# -----
sub usage {
- die "Usage:\n
export
.export user\n";
+ die "Usage:\n
apache
.export user\n";
}
}