diff options
Diffstat (limited to 'manifests/apache.pp')
| -rw-r--r-- | manifests/apache.pp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/manifests/apache.pp b/manifests/apache.pp index a91fee9..c560e5b 100644 --- a/manifests/apache.pp +++ b/manifests/apache.pp @@ -1,10 +1,10 @@ -class nagios::apache { +class nagios::apache inherits ::apache { $nagios_httpd = 'apache' include nagios case $operatingsystem { 'debian': { - file { "${nagios::nagios_cfgdir}/apache2.conf": + file { "${nagios::defaults::vars::int_nagios_cfgdir}/apache2.conf": ensure => present, source => ["puppet:///site-nagios/configs/${fqdn}/apache2.conf", "puppet:///site-nagios/configs/apache2.conf", @@ -13,8 +13,8 @@ class nagios::apache { apache::config::global { "nagios3.conf": ensure => link, - target => "${nagios::nagios_cfgdir}/apache2.conf", - require => File["${nagios::nagios_cfgdir}/apache2.conf"], + target => "${nagios::defaults::vars::int_nagios_cfgdir}/apache2.conf", + require => File["${nagios::defaults::vars::int_nagios_cfgdir}/apache2.conf"], } } } |