Commit 06251759 authored by mh's avatar mh
Browse files

new style for 2.7

parent 9c90e71c
......@@ -9,7 +9,7 @@ class mod_security::base {
notify => Service['apache'],
}
$config_dir = $operatingsystem ? {
$config_dir = $::operatingsystem ? {
centos => "${apache::centos::config_dir}/modsecurity.d",
debian => "${apache::debian::config_dir}/modsecurity.d",
default => '/etc/apache2/conf.d',
......@@ -47,9 +47,9 @@ class mod_security::base {
File['mod_security_asl_update_script']{
ensure => present,
source => [ "puppet:///modules/site-mod_security/scripts/$operatingsystem/mod_security_asl_update.sh",
"puppet:///modules/site-mod_security/scripts/mod_security_asl_update.sh",
"puppet:///modules/mod_security/scripts/$operatingsystem/mod_security_asl_update.sh",
source => [ "puppet:///modules/site_mod_security/scripts/${::operatingsystem}/mod_security_asl_update.sh",
"puppet:///modules/site_mod_security/scripts/mod_security_asl_update.sh",
"puppet:///modules/mod_security/scripts/${::operatingsystem}/mod_security_asl_update.sh",
"puppet:///modules/mod_security/scripts/mod_security_asl_update.sh" ],
owner => 'root',
group => 0,
......@@ -108,9 +108,9 @@ class mod_security::base {
File['mod_security_logclean_script']{
ensure => present,
source => [ "puppet:///modules/site-mod_security/scripts/$operatingsystem/mod_security_logclean.sh",
"puppet:///modules/site-mod_security/scripts/mod_security_logclean.sh",
"puppet:///modules/mod_security/scripts/$operatingsystem/mod_security_logclean.sh",
source => [ "puppet:///modules/site_mod_security/scripts/${::operatingsystem}/mod_security_logclean.sh",
"puppet:///modules/site_mod_security/scripts/mod_security_logclean.sh",
"puppet:///modules/mod_security/scripts/${::operatingsystem}/mod_security_logclean.sh",
"puppet:///modules/mod_security/scripts/mod_security_logclean.sh" ],
owner => 'root',
group => 0,
......
class mod_security::centos inherits mod_security::base {
apache::config::global{'mod_security.conf':
source => "modules/mod_security/normal/${operatingsystem}/mod_security.conf",
source => "modules/mod_security/normal/${::operatingsystem}/mod_security.conf",
require => Package['mod_security'],
notify => Service['apache'],
}
......
......@@ -4,7 +4,7 @@
# License: GPLv3
class mod_security {
case $operatingsystem {
case $::operatingsystem {
centos: { include mod_security::centos }
debian: { include mod_security::debian }
default: { include mod_security::base }
......
class mod_security::itk inherits mod_security {
case $operatingsystem {
case $::operatingsystem {
default: { include mod_security::itk::base }
}
}
class mod_security::itk_plus inherits mod_security::itk {
case $operatingsystem {
case $::operatingsystem {
centos: { include mod_security::itk_plus::centos }
}
}
class mod_security::itk_plus::centos inherits mod_security::centos {
Apache::Config::Global['mod_security.conf']{
source => "modules/mod_security/itk_plus/${operatingsystem}/mod_security.conf",
source => "modules/mod_security/itk_plus/${::operatingsystem}/mod_security.conf",
}
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment