From b595613827a173fe1240f654f86c3e490dc72921 Mon Sep 17 00:00:00 2001
From: Michael Fleming <mfleming@fedoraproject.org>
Date: Jun 30 2010 09:41:40 +0000
Subject: - Fix log dirs and files ordering per bz#569360


---

diff --git a/mod_security.conf b/mod_security.conf
index ad67068..b868f6b 100644
--- a/mod_security.conf
+++ b/mod_security.conf
@@ -9,7 +9,6 @@ LoadModule unique_id_module modules/mod_unique_id.so
 	# Basic configuration goes in here
 	Include modsecurity.d/*.conf
 	Include modsecurity.d/base_rules/*.conf
-	Include modsecurity.d/modsecurity_localrules.conf
 
 	# Additional items taken from new minimal modsecurity conf
 	# Basic configuration options
@@ -28,7 +27,7 @@ LoadModule unique_id_module modules/mod_unique_id.so
 	SecUploadFileLimit 10
 
 	# Debug log
-	SecDebugLog logs/modsec_debug.log
+	SecDebugLog /var/log/httpd/modsec_debug.log
 	SecDebugLogLevel 0
 
 	# Serial audit log
@@ -36,10 +35,10 @@ LoadModule unique_id_module modules/mod_unique_id.so
 	SecAuditLogRelevantStatus ^5
 	SecAuditLogParts ABIFHZ
 	SecAuditLogType Serial
-	SecAuditLog logs/modsec_audit.log
+	SecAuditLog /var/log/httpd/modsec_audit.log
 
 	# Set Data Directory
-	SecDataDir logs/
+	SecDataDir /var/log/httpd/
 
 	# Maximum request body size we will
 	# accept for buffering
@@ -90,4 +89,7 @@ LoadModule unique_id_module modules/mod_unique_id.so
 	SecRule TX:/^MSC_/ "!@streq 0" \
 	        "phase:2,t:none,deny,msg:'ModSecurity internal error flagged: %{MATCHED_VAR_NAME}'"
 
+	# Local rules
+	Include modsecurity.d/modsecurity_localrules.conf
+
 </IfModule>
diff --git a/mod_security.spec b/mod_security.spec
index b4f9365..4af73ed 100644
--- a/mod_security.spec
+++ b/mod_security.spec
@@ -1,7 +1,7 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
 Version: 2.5.12
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 URL: http://www.modsecurity.org/
 Group: System Environment/Daemons
@@ -55,6 +55,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/httpd/modsecurity.d/*.conf
 
 %changelog
+* Wed Jun 30 2010 Michael Fleming <mfleming+rpm@thatfleminggent.com> - 2.5.12-3
+- Fix log dirs and files ordering per bz#569360
+
 * Thu Apr 29 2010 Michael Fleming <mfleming+rpm@thatfleminggent.com> - 2.5.12-2
 - Fix SecDatadir and minimal config per bz #569360