diff options
| author | mh <mh@immerda.ch> | 2012-06-08 13:04:33 -0300 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2012-06-08 13:04:33 -0300 |
| commit | 106515b61b731489cce2d8b74bea13b26d4a65f6 (patch) | |
| tree | c2e221f0652a5ab87428a540e2556439c5d4a999 /manifests/apache.pp | |
| parent | 315a1942cacc58aecfe275599e54fa9da8252518 (diff) | |
refactor things for >2.7
Diffstat (limited to 'manifests/apache.pp')
| -rw-r--r-- | manifests/apache.pp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/manifests/apache.pp b/manifests/apache.pp index 0696723..38026f7 100644 --- a/manifests/apache.pp +++ b/manifests/apache.pp @@ -1,22 +1,22 @@ class nagios::apache inherits ::apache { - class{'nagios': - httpd => 'apache' - } + class{'nagios': + httpd => 'apache' + } - case $::operatingsystem { - 'debian': { - file { "${nagios::defaults::vars::int_cfgdir}/apache2.conf": - ensure => present, - source => ["puppet:///site_nagios/configs/${::fqdn}/apache2.conf", - "puppet:///site_nagios/configs/apache2.conf", - "puppet:///nagios/configs/apache2.conf"], - } + case $::operatingsystem { + 'debian': { + file { "${nagios::defaults::vars::int_cfgdir}/apache2.conf": + ensure => present, + source => [ "puppet:///site_nagios/configs/${::fqdn}/apache2.conf", + "puppet:///site_nagios/configs/apache2.conf", + "puppet:///nagios/configs/apache2.conf"], + } - apache::config::global { "nagios3.conf": - ensure => link, - target => "${nagios::defaults::vars::int_cfgdir}/apache2.conf", - require => File["${nagios::defaults::vars::int_cfgdir}/apache2.conf"], - } - } + apache::config::global { "nagios3.conf": + ensure => link, + target => "${nagios::defaults::vars::int_cfgdir}/apache2.conf", + require => File["${nagios::defaults::vars::int_cfgdir}/apache2.conf"], + } } + } } |