X-Git-Url: http://git.pld-linux.org/?p=packages%2Fapache-mod_security.git;a=blobdiff_plain;f=apache-mod_security.conf;h=90b8b7c8bb139e53c19598f2ac82c1d65487d6a5;hp=4c272b2931e6f8793fbb7b1beff9da343dabb73c;hb=ea485c0653d9345c0e648df0bc4b2a0c5f6fcbef;hpb=d7014d5c333c992ba8e21e1e94593ce3f4fef8b1

diff --git a/apache-mod_security.conf b/apache-mod_security.conf
index 4c272b2..90b8b7c 100644
--- a/apache-mod_security.conf
+++ b/apache-mod_security.conf
@@ -2,30 +2,29 @@
 
 #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 @@ LoadModule security2_module modules/mod_security2.so
 
 	# Put your local rules in here.
 
-	Include modsecurity.d/modsecurity_localrules.conf
+	# Include conf.d/modsecurity.d/modsecurity_localrules.conf
 </IfModule>