From aa87ce0c5bbf39fa3ac370960c2eec7c81b23cd3 Mon Sep 17 00:00:00 2001 From: Jerome Charaoui Date: Wed, 2 Dec 2009 18:23:56 -0500 Subject: move nagios templates in a file resource as puppet doesn't support them using native types, see issue #1180 --- manifests/defaults/templates.pp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 manifests/defaults/templates.pp (limited to 'manifests/defaults/templates.pp') diff --git a/manifests/defaults/templates.pp b/manifests/defaults/templates.pp new file mode 100644 index 0000000..752ba60 --- /dev/null +++ b/manifests/defaults/templates.pp @@ -0,0 +1,14 @@ +class nagios::defaults::templates { + + file { 'nagios_templates': + path => "${nagios_cfgdir}/conf.d/nagios_templates.cfg", + source => [ "puppet://$server/modules/site-nagios/configs/${fqdn}/nagios_templates.cfg", + "puppet://$server/modules/site-nagios/configs/${operatingsystem}/nagios_templates.cfg", + "puppet://$server/modules/site-nagios/configs/nagios_templates.cfg", + "puppet://$server/modules/nagios/configs/${operatingsystem}/nagios_templates.cfg", + "puppet://$server/modules/nagios/configs/nagios_templates.cfg" ], + notify => Service['nagios'], + mode => 0644, owner => root, group => root; + } + +} -- cgit v1.2.3 From e768ec64081846a5ed091e47ac9b5b79d3893e70 Mon Sep 17 00:00:00 2001 From: Jerome Charaoui Date: Wed, 2 Dec 2009 18:37:12 -0500 Subject: fix cfgdir variable scope --- manifests/defaults/templates.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests/defaults/templates.pp') diff --git a/manifests/defaults/templates.pp b/manifests/defaults/templates.pp index 752ba60..5a3d23d 100644 --- a/manifests/defaults/templates.pp +++ b/manifests/defaults/templates.pp @@ -1,7 +1,7 @@ class nagios::defaults::templates { file { 'nagios_templates': - path => "${nagios_cfgdir}/conf.d/nagios_templates.cfg", + path => "${nagios::nagios_cfgdir}/conf.d/nagios_templates.cfg", source => [ "puppet://$server/modules/site-nagios/configs/${fqdn}/nagios_templates.cfg", "puppet://$server/modules/site-nagios/configs/${operatingsystem}/nagios_templates.cfg", "puppet://$server/modules/site-nagios/configs/nagios_templates.cfg", -- cgit v1.2.3