From 1c89ddf732b621aaceda0b6ea70b2cbf606868c8 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Sat, 6 Mar 2010 18:15:50 -0500
Subject: Download rules during installation

---
 config/apache_mod_security/apache_mod_security.inc |  8 ++++++++
 config/apache_mod_security/apache_mod_security.xml | 15 ---------------
 2 files changed, 8 insertions(+), 15 deletions(-)

(limited to 'config')

diff --git a/config/apache_mod_security/apache_mod_security.inc b/config/apache_mod_security/apache_mod_security.inc
index 76aecabe..1126c309 100644
--- a/config/apache_mod_security/apache_mod_security.inc
+++ b/config/apache_mod_security/apache_mod_security.inc
@@ -62,6 +62,14 @@ function apache_mod_security_restart() {
 function apache_mod_security_install() {
 	global $config, $g;
 
+	exec("/usr/bin/fetch -q -o " . rules_directory . "/ http://www.pfsense.com/packages/config/apache_mod_security/rules/10_asl_rules.conf");
+	exec("/usr/bin/fetch -q -o " . rules_directory . "/ http://www.pfsense.com/packages/config/apache_mod_security/rules/a_exclude.conf");
+	exec("/usr/bin/fetch -q -o " . rules_directory . "/ http://www.pfsense.com/packages/config/apache_mod_security/rules/blacklist.conf");
+	exec("/usr/bin/fetch -q -o " . rules_directory . "/ http://www.pfsense.com/packages/config/apache_mod_security/rules/default.conf");
+	exec("/usr/bin/fetch -q -o " . rules_directory . "/ http://www.pfsense.com/packages/config/apache_mod_security/rules/recons.conf");
+	exec("/usr/bin/fetch -q -o " . rules_directory . "/ http://www.pfsense.com/packages/config/apache_mod_security/rules/rootkits.conf");
+	exec("/usr/bin/fetch -q -o " . rules_directory . "/ http://www.pfsense.com/packages/config/apache_mod_security/rules/useragents.conf");
+
 	// We might be reinstalling and a configuration
 	// already exists.
 	generate_apache_configuration();
diff --git a/config/apache_mod_security/apache_mod_security.xml b/config/apache_mod_security/apache_mod_security.xml
index 23447a89..22ecb549 100644
--- a/config/apache_mod_security/apache_mod_security.xml
+++ b/config/apache_mod_security/apache_mod_security.xml
@@ -62,21 +62,6 @@
 		<chmod>0644</chmod>
 		<item>http://www.pfsense.com/packages/config/apache_mod_security/apache_mod_security_view_logs.php</item>
 	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/usr/local/apachemodsecurity/rules/</prefix>
-		<chmod>0644</chmod>
-		<item>http://www.pfsense.com/packages/config/apache_mod_security/rules/default.conf</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/usr/local/apachemodsecurity/rules/</prefix>
-		<chmod>0644</chmod>
-		<item>http://www.pfsense.com/packages/config/apache_mod_security/rules/10_asl_rules.conf</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/usr/local/apachemodsecurity/rules/</prefix>
-		<chmod>0644</chmod>
-		<item>http://www.pfsense.com/packages/config/apache_mod_security/rules/snortmodsec-rules.txt</item>
-	</additional_files_needed>
 	<tabs>
 		<tab>
 			<text>Proxy Server Settings</text>
-- 
cgit v1.2.3