add $mod_security_relevantonly flag, enabled by default, logs only on suspicious requests, set to 'false' to log all requests (as before)

15 files changed, 16 insertions, 1 deletions

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index c889bfa..f1a20f0 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -43,6 +43,7 @@ define apache::vhost(
     $htpasswd_file = 'absent',
     $htpasswd_path = 'absent',
     $mod_security = true,
+    $mod_security_relevantonly = true,
     $use_mod_macro = false,
     $ldap_auth = false,
     $ldap_user = 'any'
diff --git a/manifests/vhost/modperl.pp b/manifests/vhost/modperl.pp
index eb78c42..88e7e52 100644
--- a/manifests/vhost/modperl.pp
+++ b/manifests/vhost/modperl.pp
@@ -25,6 +25,7 @@ define apache::vhost::modperl(
     $additional_options = 'absent',
     $default_charset = 'absent',
     $mod_security = true,
+    $mod_security_relevantonly = true,
     $ssl_mode = false,
     $vhost_mode = 'template',
     $vhost_source = 'absent',
diff --git a/manifests/vhost/passenger.pp b/manifests/vhost/passenger.pp
index 633721c..0279374 100644
--- a/manifests/vhost/passenger.pp
+++ b/manifests/vhost/passenger.pp
@@ -26,6 +26,7 @@ define apache::vhost::passenger(
     $additional_options = 'absent',
     $default_charset = 'absent',
     $mod_security = true,
+    $mod_security_relevantonly = true,
     $ssl_mode = false,
     $vhost_mode = 'template',
     $vhost_source = 'absent',
diff --git a/manifests/vhost/php/drupal.pp b/manifests/vhost/php/drupal.pp
index 3c7e9ea..9c8382a 100644
--- a/manifests/vhost/php/drupal.pp
+++ b/manifests/vhost/php/drupal.pp
@@ -34,6 +34,7 @@ define apache::vhost::php::drupal(
     $additional_options = 'absent',
     $default_charset = 'absent',
     $mod_security = true,
+    $mod_security_relevantonly = true,
     $ssl_mode = false,
     $vhost_mode = 'template',
     $vhost_source = 'absent',
diff --git a/manifests/vhost/php/joomla.pp b/manifests/vhost/php/joomla.pp
index 39d224e..2239f52 100644
--- a/manifests/vhost/php/joomla.pp
+++ b/manifests/vhost/php/joomla.pp
@@ -34,6 +34,7 @@ define apache::vhost::php::joomla(
     $additional_options = 'absent',
     $default_charset = 'absent',
     $mod_security = true,
+    $mod_security_relevantonly = true,
     $ssl_mode = false,
     $vhost_mode = 'template',
     $vhost_source = 'absent',
diff --git a/manifests/vhost/php/mediawiki.pp b/manifests/vhost/php/mediawiki.pp
index d2cf346..e2f6827 100644
--- a/manifests/vhost/php/mediawiki.pp
+++ b/manifests/vhost/php/mediawiki.pp
@@ -34,6 +34,7 @@ define apache::vhost::php::mediawiki(
     $additional_options = 'absent',
     $default_charset = 'absent',
     $mod_security = true,
+    $mod_security_relevantonly = true,
     $ssl_mode = false,
     $vhost_mode = 'template',
     $vhost_source = 'absent',
diff --git a/manifests/vhost/php/simplemachine.pp b/manifests/vhost/php/simplemachine.pp
index 08916db..0f76528 100644
--- a/manifests/vhost/php/simplemachine.pp
+++ b/manifests/vhost/php/simplemachine.pp
@@ -34,6 +34,7 @@ define apache::vhost::php::simplemachine(
     $additional_options = 'absent',
     $default_charset = 'absent',
     $mod_security = true,
+    $mod_security_relevantonly = true,
     $ssl_mode = false,
     $vhost_mode = 'template',
     $vhost_source = 'absent',
diff --git a/manifests/vhost/php/spip.pp b/manifests/vhost/php/spip.pp
index cacd5e9..7b04b41 100644
--- a/manifests/vhost/php/spip.pp
+++ b/manifests/vhost/php/spip.pp
@@ -34,6 +34,7 @@ define apache::vhost::php::spip(
     $additional_options = 'absent',
     $default_charset = 'absent',
     $mod_security = true,
+    $mod_security_relevantonly = true,
     $ssl_mode = false,
     $vhost_mode = 'template',
     $vhost_source = 'absent',
diff --git a/manifests/vhost/php/standard.pp b/manifests/vhost/php/standard.pp
index a7d1276..d9359bc 100644
--- a/manifests/vhost/php/standard.pp
+++ b/manifests/vhost/php/standard.pp
@@ -41,6 +41,7 @@ define apache::vhost::php::standard(
     $default_charset = 'absent',
     $use_mod_macro = false,
     $mod_security = true,
+    $mod_security_relevantonly = true,
     $ssl_mode = false,
     $vhost_mode = 'template',
     $vhost_source = 'absent',
diff --git a/manifests/vhost/php/typo3.pp b/manifests/vhost/php/typo3.pp
index 950cba8..28edb84 100644
--- a/manifests/vhost/php/typo3.pp
+++ b/manifests/vhost/php/typo3.pp
@@ -34,6 +34,7 @@ define apache::vhost::php::typo3(
     $additional_options = 'absent',
     $default_charset = 'absent',
     $mod_security = true,
+    $mod_security_relevantonly = true,
     $ssl_mode = false,
     $vhost_mode = 'template',
     $vhost_source = 'absent',
diff --git a/manifests/vhost/php/webapp.pp b/manifests/vhost/php/webapp.pp
index e9c7f3e..929f20e 100644
--- a/manifests/vhost/php/webapp.pp
+++ b/manifests/vhost/php/webapp.pp
@@ -37,6 +37,7 @@ define apache::vhost::php::webapp(
     $additional_options = 'absent',
     $default_charset = 'absent',
     $mod_security = true,
+    $mod_security_relevantonly = true,
     $ssl_mode = false,
     $vhost_mode = 'template',
     $vhost_source = 'absent',
diff --git a/manifests/vhost/php/wordpress.pp b/manifests/vhost/php/wordpress.pp
index 0b94d4b..31e66e8 100644
--- a/manifests/vhost/php/wordpress.pp
+++ b/manifests/vhost/php/wordpress.pp
@@ -34,6 +34,7 @@ define apache::vhost::php::wordpress(
     $additional_options = 'absent',
     $default_charset = 'absent',
     $mod_security = true,
+    $mod_security_relevantonly = true,
     $ssl_mode = false,
     $vhost_mode = 'template',
     $vhost_source = 'absent',
diff --git a/manifests/vhost/static.pp b/manifests/vhost/static.pp
index 50bb3d8..6a1228a 100644
--- a/manifests/vhost/static.pp
+++ b/manifests/vhost/static.pp
@@ -23,7 +23,8 @@ define apache::vhost::static(
     $vhost_destination = 'absent',
     $htpasswd_file = 'absent',
     $htpasswd_path = 'absent',
-    $mod_security = false
+    $mod_security = false,
+    $mod_security_relevantonly = true
 ){
     # create webdir
     ::apache::vhost::webdir{$name:
diff --git a/manifests/vhost/template.pp b/manifests/vhost/template.pp
index bda1f04..cca04f1 100644
--- a/manifests/vhost/template.pp
+++ b/manifests/vhost/template.pp
@@ -47,6 +47,7 @@ define apache::vhost::template(
     $template_mode = 'static',
     $ssl_mode = false,
     $mod_security = true,
+    $mod_security_relevantonly = true,
     $use_mod_macro = false,
     $htpasswd_file = 'absent',
     $htpasswd_path = 'absent',
diff --git a/manifests/vhost/webdav.pp b/manifests/vhost/webdav.pp
index ab99039..5f0aad2 100644
--- a/manifests/vhost/webdav.pp
+++ b/manifests/vhost/webdav.pp
@@ -26,6 +26,7 @@ define apache::vhost::webdav(
     $additional_options = 'absent',
     $default_charset = 'absent',
     $mod_security = false,
+    $mod_security_relevantonly = true,
     $ssl_mode = false,
     $vhost_mode = 'template',
     $vhost_source = 'absent',