packages: apache-mod_security/apache-mod_security.conf - load module once -...

[gotar]

Author: gotar                        Date: Sat Jun 13 12:34:57 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- load module once
- commented out local rules, fixed paths

---- Files affected:
packages/apache-mod_security:
   apache-mod_security.conf (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/apache-mod_security/apache-mod_security.conf
diff -u packages/apache-mod_security/apache-mod_security.conf:1.2 packages/apache-mod_security/apache-mod_security.conf:1.3
--- packages/apache-mod_security/apache-mod_security.conf:1.2	Thu Jan 10 01:29:40 2008
+++ packages/apache-mod_security/apache-mod_security.conf	Sat Jun 13 14:34:51 2009
@@ -3,29 +3,28 @@
 #LoadFile LIBDIR/libxml2.so.2
 
 LoadModule security2_module modules/mod_security2.so
-LoadModule security2_module modules/mod_security2.so
 
 <IfModule mod_security2.c>
 	# This is the ModSecurity Core Rules Set.
 
 	# Basic configuration goes in here
-	Include modsecurity.d/modsecurity_crs_10_config.conf
+	Include conf.d/modsecurity.d/modsecurity_crs_10_config.conf
 
 	# Protocol violation and anomalies.
 
-	Include modsecurity.d/modsecurity_crs_20_protocol_violations.conf
-	Include modsecurity.d/modsecurity_crs_21_protocol_anomalies.conf
+	Include conf.d/modsecurity.d/modsecurity_crs_20_protocol_violations.conf
+	Include conf.d/modsecurity.d/modsecurity_crs_21_protocol_anomalies.conf
 
 	# HTTP policy rules
 
-	Include modsecurity.d/modsecurity_crs_30_http_policy.conf
+	Include conf.d/modsecurity.d/modsecurity_crs_30_http_policy.conf
 
 	# Here comes the Bad Stuff...
 
-	Include modsecurity.d/modsecurity_crs_35_bad_robots.conf
-	Include modsecurity.d/modsecurity_crs_40_generic_attacks.conf
-	Include modsecurity.d/modsecurity_crs_45_trojans.conf
-	Include modsecurity.d/modsecurity_crs_50_outbound.conf
+	Include conf.d/modsecurity.d/modsecurity_crs_35_bad_robots.conf
+	Include conf.d/modsecurity.d/modsecurity_crs_40_generic_attacks.conf
+	Include conf.d/modsecurity.d/modsecurity_crs_45_trojans.conf
+	Include conf.d/modsecurity.d/modsecurity_crs_50_outbound.conf
 
 	# Search engines and other crawlers. Only useful if you want to track
 	# Google / Yahoo et. al.
@@ -34,5 +33,5 @@
 
 	# Put your local rules in here.
 
-	Include modsecurity.d/modsecurity_localrules.conf
+	# Include conf.d/modsecurity.d/modsecurity_localrules.conf
 </IfModule>
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_security/apache-mod_security.conf?r1=1.2&r2=1.3&f=u