aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcello Coutinho <marcellocoutinho@gmail.com>2013-11-12 09:13:39 -0800
committerMarcello Coutinho <marcellocoutinho@gmail.com>2013-11-12 09:13:39 -0800
commit1c1d9328979a48c10320831d284c41b149b629e7 (patch)
tree82875e9292ac994774785bc9daa5a35088c5b0a8
parentdb7c9a0f45f068a752ef8ac69088700ff85d2d7d (diff)
parentafda5e86de60af53910b3335818baade7291514e (diff)
downloadpfsense-packages-1c1d9328979a48c10320831d284c41b149b629e7.tar.gz
pfsense-packages-1c1d9328979a48c10320831d284c41b149b629e7.tar.bz2
pfsense-packages-1c1d9328979a48c10320831d284c41b149b629e7.zip
Merge pull request #542 from djgel/patch-8
Update apache_mod_security.inc
-rw-r--r--config/apache_mod_security-dev/apache.template5
-rw-r--r--config/apache_mod_security-dev/apache_mod_security.inc2
2 files changed, 5 insertions, 2 deletions
diff --git a/config/apache_mod_security-dev/apache.template b/config/apache_mod_security-dev/apache.template
index 215f3376..cb2b3e17 100644
--- a/config/apache_mod_security-dev/apache.template
+++ b/config/apache_mod_security-dev/apache.template
@@ -197,6 +197,9 @@ DocumentRoot "{$apache_dir}/www/apache22"
Deny from all
</Directory>
+
+{$mod_status}
+
#
# Note that from this point forward you must specifically allow
# particular features to be enabled - so if something's not working as
@@ -509,4 +512,4 @@ Include etc/apache22/Includes/*.conf
EOF;
-?> \ No newline at end of file
+?>
diff --git a/config/apache_mod_security-dev/apache_mod_security.inc b/config/apache_mod_security-dev/apache_mod_security.inc
index 9c123e1b..615a7fc4 100644
--- a/config/apache_mod_security-dev/apache_mod_security.inc
+++ b/config/apache_mod_security-dev/apache_mod_security.inc
@@ -556,7 +556,7 @@ EOF;
Deny from all
EOF;
$mod_status .= "Allow from ".($settings['netaccessstatus'] ? $settings['netaccessstatus'] : "All")."\n";
- $mod_status .= "</Location>\n"
+ $mod_status .= "</Location>\n";
}
//** Uncomment to allow adding ip/ports not used by any site proxies