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/defaults/templates.pp | |
parent | 70afab799b8cf720cd12bd225c1c2948fd1597ee (diff) | |
parent | c0dee4a2393e23b226e123a427898de94b342141 (diff) |
Merge remote-tracking branch 'shared/master' into leap_master
Diffstat (limited to 'manifests/defaults/templates.pp')
-rw-r--r-- | manifests/defaults/templates.pp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/manifests/defaults/templates.pp b/manifests/defaults/templates.pp index 9711dd4..5158189 100644 --- a/manifests/defaults/templates.pp +++ b/manifests/defaults/templates.pp @@ -1,14 +1,17 @@ +# manage nagios_templates class nagios::defaults::templates { include nagios::defaults::vars file { 'nagios_templates': - path => "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_templates.cfg", - source => [ "puppet:///modules/site_nagios/configs/${::fqdn}/nagios_templates.cfg", + path => "${nagios::defaults::vars::int_cfgdir}/nagios_templates.cfg", + source => [ "puppet:///modules/site_nagios/configs/${::fqdn}/nagios_templates.cfg", "puppet:///modules/site_nagios/configs/${::operatingsystem}/nagios_templates.cfg", - "puppet:///modules/site_nagios/configs/nagios_templates.cfg", + 'puppet:///modules/site_nagios/configs/nagios_templates.cfg', "puppet:///modules/nagios/configs/${::operatingsystem}/nagios_templates.cfg", - "puppet:///modules/nagios/configs/nagios_templates.cfg" ], - notify => Service['nagios'], - mode => 0644, owner => root, group => root; + 'puppet:///modules/nagios/configs/nagios_templates.cfg' ], + notify => Service['nagios'], + owner => root, + group => root, + mode => '0644'; } } |