diff options
| author | mh <mh@immerda.ch> | 2012-06-05 19:34:51 -0300 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2012-06-05 19:34:51 -0300 |
| commit | 0fe7552f256f0b1508cc5d3cab952eb93bee6811 (patch) | |
| tree | 9769eab5ea4b9bf6f49c2c11d9a9b9e1736361c9 /manifests/apache.pp | |
| parent | 3db1ca8f85b28978a3a9c09de3551f536b1375a6 (diff) | |
new style for 2.7
Diffstat (limited to 'manifests/apache.pp')
| -rw-r--r-- | manifests/apache.pp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/manifests/apache.pp b/manifests/apache.pp index 6acf538..0696723 100644 --- a/manifests/apache.pp +++ b/manifests/apache.pp @@ -1,20 +1,21 @@ class nagios::apache inherits ::apache { - $nagios_httpd = 'apache' - include nagios + class{'nagios': + httpd => 'apache' + } case $::operatingsystem { 'debian': { - file { "${nagios::defaults::vars::int_nagios_cfgdir}/apache2.conf": + file { "${nagios::defaults::vars::int_cfgdir}/apache2.conf": ensure => present, - source => ["puppet:///site-nagios/configs/${fqdn}/apache2.conf", - "puppet:///site-nagios/configs/apache2.conf", + 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_nagios_cfgdir}/apache2.conf", - require => File["${nagios::defaults::vars::int_nagios_cfgdir}/apache2.conf"], + target => "${nagios::defaults::vars::int_cfgdir}/apache2.conf", + require => File["${nagios::defaults::vars::int_cfgdir}/apache2.conf"], } } } |