From 2b250a87dc0765e27bd693b7d5abcd14d50bc543 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Sun, 13 Feb 2011 20:19:02 +0000 Subject: [PATCH] squeeze seems to keep its nrpe pidfile in a sensible place Signed-off-by: Stephen Gran --- modules/nagios/manifests/client.pp | 5 ++--- .../nagios/{files/common/nrpe.cfg => templates/nrpe.cfg.erb} | 5 ++++- 2 files changed, 6 insertions(+), 4 deletions(-) rename modules/nagios/{files/common/nrpe.cfg => templates/nrpe.cfg.erb} (98%) diff --git a/modules/nagios/manifests/client.pp b/modules/nagios/manifests/client.pp index 44a6f325..2b76eb62 100644 --- a/modules/nagios/manifests/client.pp +++ b/modules/nagios/manifests/client.pp @@ -14,8 +14,7 @@ class nagios::client inherits nagios { ensure => absent, notify => Exec["nagios-nrpe-server restart"]; "/etc/nagios/nrpe.cfg": - source => [ "puppet:///modules/nagios/per-host/$fqdn/nrpe.cfg", - "puppet:///modules/nagios/common/nrpe.cfg" ], + content => template("nagios/nrpe.cfg.erb"), require => Package["nagios-nrpe-server"], notify => Exec["nagios-nrpe-server restart"]; "/etc/nagios/nrpe.d": @@ -23,7 +22,7 @@ class nagios::client inherits nagios { require => Package["nagios-nrpe-server"], ensure => directory; "/etc/nagios/nrpe.d/debianorg.cfg": - content => template("nagios/inc-debian.org.erb"), + content => template("nagios/inc-debian.org.erb"), require => Package["nagios-nrpe-server"], notify => Exec["nagios-nrpe-server restart"]; "/etc/nagios/nrpe.d/nrpe_dsa.cfg": diff --git a/modules/nagios/files/common/nrpe.cfg b/modules/nagios/templates/nrpe.cfg.erb similarity index 98% rename from modules/nagios/files/common/nrpe.cfg rename to modules/nagios/templates/nrpe.cfg.erb index d9248341..85ce99a1 100644 --- a/modules/nagios/files/common/nrpe.cfg +++ b/modules/nagios/templates/nrpe.cfg.erb @@ -27,8 +27,11 @@ log_facility=daemon # number. The file is only written if the NRPE daemon is started by the root # user and is running in standalone mode. +<% if nodeinfo.has_key?('squeeze') and nodeinfo['squeeze'] %> +pid_file=/var/run/nagios/nrpe.pid +<% else %> pid_file=/var/run/nrpe.pid - +<% end %> # PORT NUMBER -- 2.39.2