From 5b001cdce1987a38367e27b2ca0147df18aec789 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Sun, 21 Jun 2009 21:57:25 -0400
Subject: Do not mount rw every time file is sourced.  Fix comments.

---
 config/apache_mod_security/apache_mod_security.inc | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'config/apache_mod_security/apache_mod_security.inc')

diff --git a/config/apache_mod_security/apache_mod_security.inc b/config/apache_mod_security/apache_mod_security.inc
index 5ae1b198..0663c9e9 100644
--- a/config/apache_mod_security/apache_mod_security.inc
+++ b/config/apache_mod_security/apache_mod_security.inc
@@ -1,14 +1,12 @@
 <?php
 
-// Syntax:ProxyPreserveHost On|Off
-
-global $config, $g;
-conf_mount_rw();
-if(!is_dir("/usr/local/apachemodsecurity")) 
+if(!is_dir("/usr/local/apachemodsecurity"))  {
 	safe_mkdir("/usr/local/apachemodsecurity");
+	conf_mount_rw();
+}
 
 function apache_mod_security_install() {
-
+	global $config, $g;
 }
 
 function apache_mod_security_deinstall() {
@@ -21,9 +19,11 @@ function apache_mod_security_resync() {
 	generate_apache_configuration();
 }
 
+// Generate mod_proxy specific configuration
 function generate_apache_configuration() {
 	global $config, $g;
-	// Generate mod_proxy specific configuration
+
+	// Syntax:ProxyPreserveHost On|Off ?
 	$mod_proxy = "ProxyRequests on\n";
 	
 	$mod_proxy = <<<EOF
@@ -33,7 +33,8 @@ function generate_apache_configuration() {
 </Proxy>	
 
 EOF;
-	
+
+	// Setup mod_proxy entries
 	if($config['installedpackages']['apachemodsecurity']) {
 		foreach($config['installedpackages']['apachemodsecurity']['config'] as $ams) {
 			$backend_sites = "";
@@ -47,6 +48,7 @@ EOF;
 			}
 		}
 	}
+
 	// Set global site e-mail
 	if($config['installedpackages']['apache_mod_security_settings']['config']['globalsiteadminemail']) {
 		$global_site_email = $config['installedpackages']['apache_mod_security_settings']['config']['globalsiteadminemail'];
-- 
cgit v1.2.3