diff options
| author | varac <varacanero@zeromail.org> | 2016-03-01 11:59:10 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2016-03-01 11:59:10 +0100 |
| commit | 53e2db13e5082f09fcee7d34ed83b3dfaef06e52 (patch) | |
| tree | 3f082b3311d08140e29c9ca730cfa3c8061545a8 /manifests/debian/apache.pp | |
| parent | 70afab799b8cf720cd12bd225c1c2948fd1597ee (diff) | |
| parent | c0dee4a2393e23b226e123a427898de94b342141 (diff) | |
Merge remote-tracking branch 'shared/master' into leap_master
Diffstat (limited to 'manifests/debian/apache.pp')
| -rw-r--r-- | manifests/debian/apache.pp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/manifests/debian/apache.pp b/manifests/debian/apache.pp index 095091e..17b60c6 100644 --- a/manifests/debian/apache.pp +++ b/manifests/debian/apache.pp @@ -5,10 +5,9 @@ # class nagios::debian::apache { - include nagios::defaults::vars + include ::nagios::defaults::vars file { "${nagios::defaults::vars::int_cfgdir}/apache2.conf": - ensure => present, source => [ "puppet:///modules/site_nagios/configs/${::fqdn}/apache2.conf", 'puppet:///modules/site_nagios/configs/apache2.conf', 'puppet:///modules/nagios/configs/apache2.conf'], |