summaryrefslogtreecommitdiff
path: root/manifests/pnp4nagios.pp
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2014-10-05 12:36:29 +0200
committermh <mh@immerda.ch>2014-10-05 12:36:29 +0200
commitb52d91b8fcabf0c6b1cd648cf996b7468be60969 (patch)
tree921d17303860ed9e9b7d6f1847b90a04e55ebb7c /manifests/pnp4nagios.pp
parentb1a10d01e4c4682540eab75541845514ea8c4dd0 (diff)
get auto purging working again
That purging resources work correctly, the config files must be at the location that the nagios providers have internally, which is at /etc/nagios/<name>.cfg To ease the config file we used the cfg_dir option so far, which we can't anymore and hence this change requires adoption of your site modules. But auto-purging resources will then finally work.
Diffstat (limited to 'manifests/pnp4nagios.pp')
-rw-r--r--manifests/pnp4nagios.pp7
1 files changed, 4 insertions, 3 deletions
diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp
index 5ade74f..3faaae3 100644
--- a/manifests/pnp4nagios.pp
+++ b/manifests/pnp4nagios.pp
@@ -1,3 +1,4 @@
+# manage pnp4nagios
class nagios::pnp4nagios {
include nagios::defaults::pnp4nagios
@@ -10,7 +11,7 @@ class nagios::pnp4nagios {
# see http://projects.reductivelabs.com/issues/1180 for this limitation
file { 'pnp4nagios-templates.cfg':
- path => "${nagios::defaults::vars::int_cfgdir}/conf.d/pnp4nagios-templates.cfg",
+ path => "${nagios::defaults::vars::int_cfgdir}/pnp4nagios-templates.cfg",
source => [ 'puppet:///modules/site_nagios/pnp4nagios/pnp4nagios-templates.cfg',
'puppet:///modules/nagios/pnp4nagios/pnp4nagios-templates.cfg' ],
mode => '0644',
@@ -21,8 +22,8 @@ class nagios::pnp4nagios {
file { 'apache.conf':
path => '/etc/pnp4nagios/apache.conf',
- source => [ 'puppet:///modules/site_nagios/pnp4nagios/apache.conf',
- 'puppet:///modules/nagios/pnp4nagios/apache.conf' ],
+ source => ['puppet:///modules/site_nagios/pnp4nagios/apache.conf',
+ 'puppet:///modules/nagios/pnp4nagios/apache.conf' ],
mode => '0644',
owner => root,
group => root,