migrate missing parts

- migrate missing (newly introduced) vhosts
- pass relevant_only stuff to subdefines

14 files changed, 16 insertions, 0 deletions

diff --git a/manifests/vhost/modperl.pp b/manifests/vhost/modperl.pp
index 88e7e52..98876e4 100644
--- a/manifests/vhost/modperl.pp
+++ b/manifests/vhost/modperl.pp
@@ -90,6 +90,7 @@ define apache::vhost::modperl(
         htpasswd_file => $htpasswd_file,
         htpasswd_path => $htpasswd_path,
         mod_security => $mod_security,
+        mod_security_relevantonly => $mod_security_relevantonly,
     }
 }
 
diff --git a/manifests/vhost/passenger.pp b/manifests/vhost/passenger.pp
index 0279374..732758e 100644
--- a/manifests/vhost/passenger.pp
+++ b/manifests/vhost/passenger.pp
@@ -72,6 +72,7 @@ define apache::vhost::passenger(
         htpasswd_file => $htpasswd_file,
         htpasswd_path => $htpasswd_path,
         mod_security => $mod_security,
+        mod_security_relevantonly => $mod_security_relevantonly,
     }
 }
 
diff --git a/manifests/vhost/php/drupal.pp b/manifests/vhost/php/drupal.pp
index 9bd5f2e..f23a434 100644
--- a/manifests/vhost/php/drupal.pp
+++ b/manifests/vhost/php/drupal.pp
@@ -87,6 +87,7 @@ define apache::vhost::php::drupal(
         additional_options => $additional_options,
         default_charset => $default_charset,
         mod_security => $mod_security,
+        mod_security_relevantonly => $mod_security_relevantonly,
         ssl_mode => $ssl_mode,
         vhost_mode => $vhost_mode,
         vhost_source => $vhost_source,
diff --git a/manifests/vhost/php/gallery2.pp b/manifests/vhost/php/gallery2.pp
index 924e322..19240e9 100644
--- a/manifests/vhost/php/gallery2.pp
+++ b/manifests/vhost/php/gallery2.pp
@@ -34,6 +34,7 @@ define apache::vhost::php::gallery2(
     $additional_options = 'absent',
     $default_charset = 'absent',
     $mod_security = true,
+    $mod_security_relevantonly = true,
     $ssl_mode = false,
     $vhost_mode = 'template',
     $vhost_source = 'absent',
@@ -94,6 +95,7 @@ define apache::vhost::php::gallery2(
         additional_options => $additional_options,
         default_charset => $default_charset,
         mod_security => $mod_security,
+        mod_security_relevantonly => $mod_security_relevantonly,
         ssl_mode => $ssl_mode,
         vhost_mode => $vhost_mode,
         vhost_source => $vhost_source,
diff --git a/manifests/vhost/php/joomla.pp b/manifests/vhost/php/joomla.pp
index 2239f52..280792e 100644
--- a/manifests/vhost/php/joomla.pp
+++ b/manifests/vhost/php/joomla.pp
@@ -81,6 +81,7 @@ define apache::vhost::php::joomla(
         additional_options => $additional_options,
         default_charset => $default_charset,
         mod_security => $mod_security,
+        mod_security_relevantonly => $mod_security_relevantonly,
         ssl_mode => $ssl_mode,
         vhost_mode => $vhost_mode,
         vhost_source => $vhost_source,
diff --git a/manifests/vhost/php/mediawiki.pp b/manifests/vhost/php/mediawiki.pp
index e2f6827..d24ada9 100644
--- a/manifests/vhost/php/mediawiki.pp
+++ b/manifests/vhost/php/mediawiki.pp
@@ -67,6 +67,7 @@ define apache::vhost::php::mediawiki(
         additional_options => $additional_options,
         default_charset => $default_charset,
         mod_security => $mod_security,
+        mod_security_relevantonly => $mod_security_relevantonly,
         ssl_mode => $ssl_mode,
         vhost_mode => $vhost_mode,
         vhost_source => $vhost_source,
diff --git a/manifests/vhost/php/silverstripe.pp b/manifests/vhost/php/silverstripe.pp
index 16f9d32..3838d55 100644
--- a/manifests/vhost/php/silverstripe.pp
+++ b/manifests/vhost/php/silverstripe.pp
@@ -34,6 +34,7 @@ define apache::vhost::php::silverstripe(
     $additional_options = 'absent',
     $default_charset = 'absent',
     $mod_security = true,
+    $mod_security_relevantonly = true,
     $ssl_mode = false,
     $vhost_mode = 'template',
     $vhost_source = 'absent',
@@ -78,6 +79,7 @@ define apache::vhost::php::silverstripe(
         additional_options => $additional_options,
         default_charset => $default_charset,
         mod_security => $mod_security,
+        mod_security_relevantonly => $mod_security_relevantonly,
         ssl_mode => $ssl_mode,
         vhost_mode => $vhost_mode,
         vhost_source => $vhost_source,
diff --git a/manifests/vhost/php/simplemachine.pp b/manifests/vhost/php/simplemachine.pp
index 0f76528..f1ea170 100644
--- a/manifests/vhost/php/simplemachine.pp
+++ b/manifests/vhost/php/simplemachine.pp
@@ -79,6 +79,7 @@ define apache::vhost::php::simplemachine(
         additional_options => $additional_options,
         default_charset => $default_charset,
         mod_security => $mod_security,
+        mod_security_relevantonly => $mod_security_relevantonly,
         ssl_mode => $ssl_mode,
         vhost_mode => $vhost_mode,
         vhost_source => $vhost_source,
diff --git a/manifests/vhost/php/spip.pp b/manifests/vhost/php/spip.pp
index 7b04b41..5064e77 100644
--- a/manifests/vhost/php/spip.pp
+++ b/manifests/vhost/php/spip.pp
@@ -76,6 +76,7 @@ define apache::vhost::php::spip(
         additional_options => $additional_options,
         default_charset => $default_charset,
         mod_security => $mod_security,
+        mod_security_relevantonly => $mod_security_relevantonly,
         ssl_mode => $ssl_mode,
         vhost_mode => $vhost_mode,
         vhost_source => $vhost_source,
diff --git a/manifests/vhost/php/standard.pp b/manifests/vhost/php/standard.pp
index 249f25f..a6e2ff0 100644
--- a/manifests/vhost/php/standard.pp
+++ b/manifests/vhost/php/standard.pp
@@ -150,6 +150,7 @@ define apache::vhost::php::standard(
         htpasswd_file => $htpasswd_file,
         htpasswd_path => $htpasswd_path,
         mod_security => $mod_security,
+        mod_security_relevantonly => $mod_security_relevantonly,
         use_mod_macro => $use_mod_macro,
     }
 }
diff --git a/manifests/vhost/php/typo3.pp b/manifests/vhost/php/typo3.pp
index 28edb84..dec227c 100644
--- a/manifests/vhost/php/typo3.pp
+++ b/manifests/vhost/php/typo3.pp
@@ -79,6 +79,7 @@ define apache::vhost::php::typo3(
         additional_options => $additional_options,
         default_charset => $default_charset,
         mod_security => $mod_security,
+        mod_security_relevantonly => $mod_security_relevantonly,
         ssl_mode => $ssl_mode,
         vhost_mode => $vhost_mode,
         vhost_source => $vhost_source,
diff --git a/manifests/vhost/php/webapp.pp b/manifests/vhost/php/webapp.pp
index 929f20e..22e932a 100644
--- a/manifests/vhost/php/webapp.pp
+++ b/manifests/vhost/php/webapp.pp
@@ -107,6 +107,7 @@ define apache::vhost::php::webapp(
         additional_options => $additional_options,
         default_charset => $default_charset,
         mod_security => $mod_security,
+        mod_security_relevantonly => $mod_security_relevantonly,
         ssl_mode => $ssl_mode,
         vhost_mode => $vhost_mode,
         vhost_source => $vhost_source,
diff --git a/manifests/vhost/php/wordpress.pp b/manifests/vhost/php/wordpress.pp
index 31e66e8..c4e77f2 100644
--- a/manifests/vhost/php/wordpress.pp
+++ b/manifests/vhost/php/wordpress.pp
@@ -80,6 +80,7 @@ define apache::vhost::php::wordpress(
         additional_options => $additional_options,
         default_charset => $default_charset,
         mod_security => $mod_security,
+        mod_security_relevantonly => $mod_security_relevantonly,
         ssl_mode => $ssl_mode,
         vhost_mode => $vhost_mode,
         vhost_source => $vhost_source,
diff --git a/manifests/vhost/static.pp b/manifests/vhost/static.pp
index 6a1228a..307dfbe 100644
--- a/manifests/vhost/static.pp
+++ b/manifests/vhost/static.pp
@@ -58,6 +58,7 @@ define apache::vhost::static(
         htpasswd_file => $htpasswd_file,
         htpasswd_path => $htpasswd_path,
         mod_security => $mod_security,
+        mod_security_relevantonly => $mod_security_relevantonly,
     }
 }