diff options
author | varac <varacanero@zeromail.org> | 2012-09-25 21:29:31 +0200 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2012-09-26 00:25:42 +0200 |
commit | 9aebb810f9c6a5bd211c4fbcb8322a41e5f9a17b (patch) | |
tree | e600ff3a8fed5b6506f07023ef197e50461e0ad2 /manifests | |
parent | 2635b151f7be5aafa83d1d76b50a1586f74ec9c3 (diff) |
fix proper deployment of pnp4nagios-templates.cfg
Diffstat (limited to 'manifests')
-rw-r--r-- | manifests/pnp4nagios.pp | 2 | ||||
-rw-r--r-- | manifests/pnp4nagios/popup.pp | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp index 0f86d2a..efa8681 100644 --- a/manifests/pnp4nagios.pp +++ b/manifests/pnp4nagios.pp @@ -10,7 +10,7 @@ class nagios::pnp4nagios { # so we need to copy a file here. file { 'pnp4nagios-templates.cfg': - path => "$nagios::nagios_cfgdir/conf.d/pnp4nagios-templates.cfg", + path => "{nagios::defaults::vars::int_cfgdir}/conf.d/pnp4nagios-templates.cfg", source => [ "puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-templates.cfg", "puppet:///modules/nagios/pnp4nagios/pnp4nagios-templates.cfg" ], mode => 0644, owner => root, group => root, diff --git a/manifests/pnp4nagios/popup.pp b/manifests/pnp4nagios/popup.pp index b0da18b..a8de7c7 100644 --- a/manifests/pnp4nagios/popup.pp +++ b/manifests/pnp4nagios/popup.pp @@ -1,11 +1,7 @@ class nagios::pnp4nagios::popup inherits nagios::pnp4nagios { - notify {"${nagios::defaults::vars::int_nagios_cfgdir}":} File['pnp4nagios-templates.cfg']{ - path => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/pnp4nagios-templates.cfg", source => [ "puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-popup-templates.cfg", "puppet:///modules/nagios/pnp4nagios/pnp4nagios-popup-templates.cfg" ], - mode => 0644, owner => root, group => root, - notify => Service['nagios'], } file { "/usr/share/nagios3/htdocs/ssi": |