- Add missing files in previous update

- Correct debug log file name

PR:		pports/110121
Submitted by:	Dominic Mitchell <dom at happygiraffe.net> (maintainer)
Pointy hat to:	rafan

6 files changed, 28 insertions, 2 deletions

diff --git a/www/mod_security2/Makefile b/www/mod_security2/Makefile
index 2d80b16dcfd9..df5d574fa293 100644
--- a/www/mod_security2/Makefile
+++ b/www/mod_security2/Makefile
@@ -64,7 +64,7 @@ post-patch:
 	@${REINPLACE_CMD} -e '\
 		s|SecRuleEngine On|SecRuleEngine DetectionOnly|; \
 		s|SecAuditLog.*logs/modsec_audit.log|SecAuditLog /var/log/httpd-modsec2_audit.log|; \
-		s|SecDebugLog.*logs/modsec_debug.log|SecAuditLog /var/log/httpd-modsec2_debug.log|; \
+		s|SecDebugLog.*logs/modsec_debug.log|SecDebugLog /var/log/httpd-modsec2_debug.log|; \
 		s|SecServerSignature "Apache/2.2.0 (Fedora)"|SecServerSignature "Apache/${APACHE_VERSION:C/[0-9]/\0./g}x (${OPSYS})"|; \
 		' ${WRKSRCTOP}/rules/modsecurity_crs_10_config.conf
 
diff --git a/www/mod_security2/files/mod_security2.conf.in b/www/mod_security2/files/mod_security2.conf.in
new file mode 100644
index 000000000000..9553e12a1cc2
--- /dev/null
+++ b/www/mod_security2/files/mod_security2.conf.in
@@ -0,0 +1,3 @@
+<IfModule security2_module>
+    Include %%APACHEETCDIR%%/Includes/mod_security2/*.conf
+</IfModule>
diff --git a/www/mod_security2/files/pkg-message.rules.in b/www/mod_security2/files/pkg-message.rules.in
new file mode 100644
index 000000000000..206d2f1aae54
--- /dev/null
+++ b/www/mod_security2/files/pkg-message.rules.in
@@ -0,0 +1,10 @@
+
+The modsecurity 2 Core Rules have been installed in 
+
+  %%PREFIX%%/%%APACHEETCDIR%%/Includes/mod_security2/
+
+and run in "DetectionOnly" mode as not to disturb operatings.
+
+Please read http://www.modsecurity.org/projects/rules/index.html
+
+Logging is done to /var/log/httpd-modsec-*.log
diff --git a/www/mod_security21/Makefile b/www/mod_security21/Makefile
index 2d80b16dcfd9..df5d574fa293 100644
--- a/www/mod_security21/Makefile
+++ b/www/mod_security21/Makefile
@@ -64,7 +64,7 @@ post-patch:
 	@${REINPLACE_CMD} -e '\
 		s|SecRuleEngine On|SecRuleEngine DetectionOnly|; \
 		s|SecAuditLog.*logs/modsec_audit.log|SecAuditLog /var/log/httpd-modsec2_audit.log|; \
-		s|SecDebugLog.*logs/modsec_debug.log|SecAuditLog /var/log/httpd-modsec2_debug.log|; \
+		s|SecDebugLog.*logs/modsec_debug.log|SecDebugLog /var/log/httpd-modsec2_debug.log|; \
 		s|SecServerSignature "Apache/2.2.0 (Fedora)"|SecServerSignature "Apache/${APACHE_VERSION:C/[0-9]/\0./g}x (${OPSYS})"|; \
 		' ${WRKSRCTOP}/rules/modsecurity_crs_10_config.conf
 
diff --git a/www/mod_security21/files/mod_security2.conf.in b/www/mod_security21/files/mod_security2.conf.in
new file mode 100644
index 000000000000..9553e12a1cc2
--- /dev/null
+++ b/www/mod_security21/files/mod_security2.conf.in
@@ -0,0 +1,3 @@
+<IfModule security2_module>
+    Include %%APACHEETCDIR%%/Includes/mod_security2/*.conf
+</IfModule>
diff --git a/www/mod_security21/files/pkg-message.rules.in b/www/mod_security21/files/pkg-message.rules.in
new file mode 100644
index 000000000000..206d2f1aae54
--- /dev/null
+++ b/www/mod_security21/files/pkg-message.rules.in
@@ -0,0 +1,10 @@
+
+The modsecurity 2 Core Rules have been installed in 
+
+  %%PREFIX%%/%%APACHEETCDIR%%/Includes/mod_security2/
+
+and run in "DetectionOnly" mode as not to disturb operatings.
+
+Please read http://www.modsecurity.org/projects/rules/index.html
+
+Logging is done to /var/log/httpd-modsec-*.log