projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c0398ef
)
apache.export suspension, #1822
author
mark
<mark>
Fri, 27 May 2011 21:46:18 +0000
(21:46 +0000)
committer
mark
<mark>
Fri, 27 May 2011 21:46:18 +0000
(21:46 +0000)
FS/FS/part_export/apache.pm
patch
|
blob
|
history
bin/apache.export
patch
|
blob
|
history
diff --git
a/FS/FS/part_export/apache.pm
b/FS/FS/part_export/apache.pm
index
35b00cc
..
835ce8c
100644
(file)
--- a/
FS/FS/part_export/apache.pm
+++ b/
FS/FS/part_export/apache.pm
@@
-17,7
+17,7
@@
tie my %options, 'Tie::IxHash',
label => 'Template',
type => 'textarea',
default => <<'END',
label => 'Template',
type => 'textarea',
default => <<'END',
-<VirtualHost $
domain
> #generic
+<VirtualHost $
zone
> #generic
#<VirtualHost ip.addr> #preferred, http://httpd.apache.org/docs/dns-caveats.html
DocumentRoot /var/www/$zone
ServerName $zone
#<VirtualHost ip.addr> #preferred, http://httpd.apache.org/docs/dns-caveats.html
DocumentRoot /var/www/$zone
ServerName $zone
@@
-29,6
+29,23
@@
ServerAlias *.$zone
END
},
END
},
+ 'template_inactive' => {
+ label => 'Template (when suspended)',
+ type => 'textarea',
+ default => <<'END',
+<VirtualHost $zone> #generic
+#<VirtualHost ip.addr> #preferred, http://httpd.apache.org/docs/dns-caveats.html
+DocumentRoot /var/www/$zone
+ServerName $zone
+ServerAlias *.$zone
+#BandWidthModule On
+#LargeFileLimit 4096 12288
+#FrontpageEnable on
+Redirect 402 /
+</VirtualHost>
+
+END
+ },
;
%info = (
;
%info = (
diff --git
a/bin/apache.export
b/bin/apache.export
index
82eb6d6
..
02dd58a
100755
(executable)
--- a/
bin/apache.export
+++ b/
bin/apache.export
@@
-39,14
+39,19
@@
foreach my $export ( @exports ) {
open(HTTPD_CONF,">$file") or die "can't open $file: $!";
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 @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 = $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')
+ || $export->option('template');
+ # Fall back to the regular template if template_inactive doesn't exist
+ }
if ( $svc_www->svc_acct ) {
$username = $svc_www->svc_acct->username;
$dir = $svc_www->svc_acct->dir;
if ( $svc_www->svc_acct ) {
$username = $svc_www->svc_acct->username;
$dir = $svc_www->svc_acct->dir;