From 11925952cbe29b25c776941a35ae921f43882359 Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 17 Sep 2012 19:54:14 +0200 Subject: fixed conf file permissions, notify services --- manifests/pnp4nagios.pp | 1 + manifests/pnp4nagios/popup.pp | 29 ++++++++++++++++------------- 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'], + } } -- cgit v1.2.3