Permalink
Browse files

Merge branch 'COOK-869'

  • Loading branch information...
2 parents 41f14f1 + b7a59d6 commit 4adc735a0b52e8474d605f2c5676209504023255 @jtimberman jtimberman committed Dec 20, 2011
Showing with 4 additions and 1 deletion.
  1. +3 −0 nagios/attributes/client.rb
  2. +1 −1 nagios/templates/default/nrpe.cfg.erb
@@ -25,10 +25,13 @@
case node['platform']
when "ubuntu","debian"
set['nagios']['client']['install_method'] = 'package'
+ set['nagios']['nrpe']['pidfile'] = '/var/run/nagios/nrpe.pid'
when "redhat","centos","fedora","scientific"
set['nagios']['client']['install_method'] = 'source'
+ set['nagios']['nrpe']['pidfile'] = '/var/run/nrpe.pid'
else
set['nagios']['client']['install_method'] = 'source'
+ set['nagios']['nrpe']['pidfile'] = '/var/run/nrpe.pid'
end
set['nagios']['nrpe']['home'] = "/usr/lib/nagios"
@@ -1,4 +1,4 @@
-pid_file=/var/run/nrpe.pid
+pid_file=<%= node['nagios']['nrpe']['pidfile'] %>
server_port=5666
nrpe_user=nagios
nrpe_group=nagios

0 comments on commit 4adc735

Please sign in to comment.