aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2009-06-21 20:19:59 -0400
committerScott Ullrich <sullrich@pfsense.org>2009-06-21 20:19:59 -0400
commitcb7a5d289dfc5346b00aad95e705b98bd537b84d (patch)
tree59808f6e52f6368b2ce9e64d57d06f2956432fd9 /config
parent98fd41896eaafcf83a2ed90bcc68b65b74483c6d (diff)
downloadpfsense-packages-cb7a5d289dfc5346b00aad95e705b98bd537b84d.tar.gz
pfsense-packages-cb7a5d289dfc5346b00aad95e705b98bd537b84d.tar.bz2
pfsense-packages-cb7a5d289dfc5346b00aad95e705b98bd537b84d.zip
Fix listen port and ensure apache directory exists
Diffstat (limited to 'config')
-rw-r--r--config/apache_mod_security/apache_mod_security.inc14
1 files changed, 10 insertions, 4 deletions
diff --git a/config/apache_mod_security/apache_mod_security.inc b/config/apache_mod_security/apache_mod_security.inc
index a886b7e4..aec767a8 100644
--- a/config/apache_mod_security/apache_mod_security.inc
+++ b/config/apache_mod_security/apache_mod_security.inc
@@ -2,11 +2,13 @@
// Syntax:ProxyPreserveHost On|Off
+global $config, $g;
+conf_mount_rw();
+if(!is_dir("/usr/local/apachemodsecurity"))
+ safe_mkdir("/usr/local/apachemodsecurity");
+
function apache_mod_security_install() {
- global $config, $g;
- conf_mount_rw();
- if(!is_dir("/usr/local/apachemodsecurity"))
- safe_mkdir("/usr/local/apachemodsecurity");
+
}
function apache_mod_security_deinstall() {
@@ -59,6 +61,10 @@ function generate_apache_configuration() {
$global_listen .= ":80";
} else {
$global_listen = "Listen {$config['system']['hostname']}.{$config['system']['domain']}";
+ if($config['installedpackages']['apache_mod_security_settings']['config']['globalbindtoport'])
+ $global_listen .= ":" . $config['installedpackages']['apache_mod_security_settings']['config']['globalbindtoport'];
+ else
+ $global_listen .= ":80";
}
$apache_config = <<<EOF