[Pkg-nagios-changes] [pkg-nagios] r1671 - in nagios-nrpe/trunk/debian: . patches

[Alexander Wirt]

tags 411046 pending
thanks

Author: formorer
Date: 2009-07-06 05:44:44 +0000 (Mon, 06 Jul 2009)
New Revision: 1671

Added:
   nagios-nrpe/trunk/debian/patches/06_pid_directory.dpatch
Modified:
   nagios-nrpe/trunk/debian/changelog
   nagios-nrpe/trunk/debian/nagios-nrpe-server.init
   nagios-nrpe/trunk/debian/patches/00list
Log:
Fix pidfile handling


Modified: nagios-nrpe/trunk/debian/changelog
===================================================================
--- nagios-nrpe/trunk/debian/changelog	2009-07-06 05:32:28 UTC (rev 1670)
+++ nagios-nrpe/trunk/debian/changelog	2009-07-06 05:44:44 UTC (rev 1671)
@@ -4,6 +4,7 @@
   * Build against libwrap0-dev (Closes: #412705)
   * Remove 'last modified header' from nrpe config (Closes: #499280)
   * Create /etc/nagios/nrpe.d (Closes: #505700, #474333)
+  * Fix pidfile handling (Closes: #411046)
 
  -- Alexander Wirt <formorer at debian.org>  Mon, 06 Jul 2009 07:08:26 +0200
 

Modified: nagios-nrpe/trunk/debian/nagios-nrpe-server.init
===================================================================
--- nagios-nrpe/trunk/debian/nagios-nrpe-server.init	2009-07-06 05:32:28 UTC (rev 1670)
+++ nagios-nrpe/trunk/debian/nagios-nrpe-server.init	2009-07-06 05:44:44 UTC (rev 1671)
@@ -18,6 +18,7 @@
 NAME=nagios-nrpe
 DESC=nagios-nrpe
 CONFIG=/etc/nagios/nrpe.cfg
+PIDDIR=/var/run/nagios
 
 test -x $DAEMON || exit 0
 
@@ -39,6 +40,12 @@
 fi
 if [ "$NICENESS" ]; then NICENESS="-n $NICENESS"; fi
 
+#since /var/run can be wiped completly we create our run directory here
+if [ ! -d "$PIDDIR" ]; then 
+	mkdir "$PIDDIR"
+	chown nagios "$PIDDIR"
+fi
+
 set -e
 
 case "$1" in

Modified: nagios-nrpe/trunk/debian/patches/00list
===================================================================
--- nagios-nrpe/trunk/debian/patches/00list	2009-07-06 05:32:28 UTC (rev 1670)
+++ nagios-nrpe/trunk/debian/patches/00list	2009-07-06 05:44:44 UTC (rev 1671)
@@ -3,3 +3,4 @@
 03_support_nrpe.d.dpatch
 04_weird_output.dpatch
 05_pid_privileges.dpatch
+06_pid_directory.dpatch

Added: nagios-nrpe/trunk/debian/patches/06_pid_directory.dpatch
===================================================================
--- nagios-nrpe/trunk/debian/patches/06_pid_directory.dpatch	                        (rev 0)
+++ nagios-nrpe/trunk/debian/patches/06_pid_directory.dpatch	2009-07-06 05:44:44 UTC (rev 1671)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_pid_directory.dpatch by Alexander Wirt <formorer at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad nagios-nrpe-2.8.1~/sample-config/nrpe.cfg.in nagios-nrpe-2.8.1/sample-config/nrpe.cfg.in
+--- nagios-nrpe-2.8.1~/sample-config/nrpe.cfg.in	2007-03-09 19:08:58.000000000 +0100
++++ nagios-nrpe-2.8.1/sample-config/nrpe.cfg.in	2009-07-06 07:43:09.000000000 +0200
+@@ -16,7 +16,7 @@
+ # number.  The file is only written if the NRPE daemon is started by the root
+ # user and is running in standalone mode.
+ 
+-pid_file=/var/run/nrpe.pid
++pid_file=/var/run/nagios/nrpe.pid
+ 
+ 
+ 


Property changes on: nagios-nrpe/trunk/debian/patches/06_pid_directory.dpatch
___________________________________________________________________
Added: svn:executable
   + *