Merge pull request #1976 from SimonHoenscheid/unless_block_is_needed_…

…if_security_core_rules_are_used move unless into manage_security_corerules
puppetlabs · Nov 20, 2019 · 940dc4e · 940dc4e
2 parents d3a27a6 + 3ecb320
commit 940dc4e
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/manifests/mod/security.pp b/manifests/mod/security.pp
@@ -229,10 +229,10 @@
       require => File[$modsec_dir],
       notify  => Class['apache::service'],
     }
-  }
 
-  # Debian 9 has a different rule setup
-  unless $::operatingsystem == 'SLES' or ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '9') >= 0) or ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '18.04') >= 0) {
-    apache::security::rule_link { $activated_rules: }
+    # Debian 9 has a different rule setup
+    unless $::operatingsystem == 'SLES' or ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '9') >= 0) or ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '18.04') >= 0) {
+      apache::security::rule_link { $activated_rules: }
+    }
   }
 }