improve mod_security rules

* handled now by a partial
* possibility to add rules that should be removed
* possibility to add custom mod_sec options"
* use new infrastructure for existing mod_sec tweaks

1 files changed, 10 insertions, 5 deletions

diff --git a/manifests/vhost/file.pp b/manifests/vhost/file.pp
index bbd2f8c..6c750c1 100644
--- a/manifests/vhost/file.pp
+++ b/manifests/vhost/file.pp
@@ -70,22 +70,27 @@ define apache::vhost::file(
         notify => Service[apache],
         owner => root, group => 0, mode => 0644;
     }
-    if $do_includes {
+    if $ensure != 'absent' {
+      if $do_includes {
         include ::apache::includes
-    }
-    if $use_mod_macro {
+      }
+      if $use_mod_macro {
         include ::apache::mod_macro
-    }
-    if $ensure != 'absent' {
+      }
       case $logmode {
         'semianonym','anonym': { include apache::noiplog }
       }
       case $run_mode {
         'itk': {
           include ::apache::itk::lock
+          if $mod_security { include mod_security::itk }
         }
         'proxy-itk','static-itk': {
           include ::apache::itk_plus::lock
+          if $mod_security { include mod_security::itk_plus }
+        }
+        default: {
+          if $mod_security { include mod_security }
         }
       }