summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2012-09-17 19:54:14 +0200
committerMicah Anderson <micah@riseup.net>2013-02-14 17:59:00 -0500
commit11925952cbe29b25c776941a35ae921f43882359 (patch)
treee0b8a7d0eccfc0a563daa9e02e3cda38a7089ad1
parent49c433284cc069984535b452ba5c36446de8cda3 (diff)
fixed conf file permissions, notify services
-rw-r--r--manifests/pnp4nagios.pp1
-rw-r--r--manifests/pnp4nagios/popup.pp29
2 files changed, 17 insertions, 13 deletions
diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp
index dd9b0c6..d97bb1e 100644
--- a/manifests/pnp4nagios.pp
+++ b/manifests/pnp4nagios.pp
@@ -14,6 +14,7 @@ class nagios::pnp4nagios {
source => [ "puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-templates.cfg",
"puppet:///modules/nagios/pnp4nagios/pnp4nagios-templates.cfg" ],
mode => 0644, owner => root, group => root;
+ notify => Service['nagios'],
}
file { 'apache.conf':
diff --git a/manifests/pnp4nagios/popup.pp b/manifests/pnp4nagios/popup.pp
index 46b346b..bfbfae7 100644
--- a/manifests/pnp4nagios/popup.pp
+++ b/manifests/pnp4nagios/popup.pp
@@ -1,17 +1,20 @@
class nagios::pnp4nagios::popup inherits nagios::pnp4nagios {
- 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" ]
- }
+ 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/$nagios::nagios_packagename/htdocs/ssi":
- ensure => directory }
-
- file { 'status-header.ssi':
- path => "/usr/share/$nagios::nagios_packagename/htdocs/ssi/status-header.ssi",
- source => [ "puppet:///modules/site-nagios/pnp4nagios/status-header.ssi",
- "puppet:///modules/nagios/pnp4nagios/status-header.ssi" ]
- }
+ file { "/usr/share/$nagios::nagios_packagename/htdocs/ssi":
+ ensure => directory }
+ file { 'status-header.ssi':
+ path => "/usr/share/$nagios::nagios_packagename/htdocs/ssi/status-header.ssi",
+ source => [ "puppet:///modules/site-nagios/pnp4nagios/status-header.ssi",
+ "puppet:///modules/nagios/pnp4nagios/status-header.ssi" ]
+ mode => 0644, owner => root, group => root;
+ notify => Service['nagios'],
+ }
}