rpms/mod_security/EL-5 mod_security.conf, 1.9, 1.10 mod_security.spec, 1.25, 1.26

[Michael Fleming]

Author: mfleming

Update of /cvs/pkgs/rpms/mod_security/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv25417

Modified Files:
	mod_security.conf mod_security.spec 
Log Message:
* Wed Jun 30 2010 Michael Fleming <mfleming+rpm at thatfleminggent.com> - 2.5.12-3
-  - Fix log dirs and files ordering per bz#569360



Index: mod_security.conf
===================================================================
RCS file: /cvs/pkgs/rpms/mod_security/EL-5/mod_security.conf,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- mod_security.conf	29 Apr 2010 11:11:46 -0000	1.9
+++ mod_security.conf	30 Jun 2010 09:35:16 -0000	1.10
@@ -9,7 +9,6 @@ LoadModule unique_id_module modules/mod_
 	# 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_
 	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_
 	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_
 	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>


Index: mod_security.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_security/EL-5/mod_security.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- mod_security.spec	29 Apr 2010 11:11:46 -0000	1.25
+++ mod_security.spec	30 Jun 2010 09:35:16 -0000	1.26
@@ -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 at thatfleminggent.com> - 2.5.12-3
+- Fix log dirs and files ordering per bz#569360
+
 * Thu Apr 29 2010 Michael Fleming <mfleming+rpm at thatfleminggent.com> - 2.5.12-2
 - Fix SecDatadir and minimal config per bz #569360