Merge branch 'COOK-869'

pavlobaron · Dec 20, 2011 · 4adc735 · 4adc735
2 parents 41f14f1 + b7a59d6
commit 4adc735
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/nagios/attributes/client.rb b/nagios/attributes/client.rb
@@ -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"

diff --git a/nagios/templates/default/nrpe.cfg.erb b/nagios/templates/default/nrpe.cfg.erb
@@ -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