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

[Sean Finney]

Author: seanius
Date: 2006-03-31 05:22:06 +0000 (Fri, 31 Mar 2006)
New Revision: 863

Added:
   nagios-nrpe/trunk/debian/patches/02_nrpe.cfg_local-include.dpatch
Modified:
   nagios-nrpe/trunk/debian/changelog
   nagios-nrpe/trunk/debian/patches/00list
   nagios-nrpe/trunk/debian/rules
Log:
reintroduce nrpe_local.cfg so we don't pull the rug out from
under people who expect it to be there.


Modified: nagios-nrpe/trunk/debian/changelog
===================================================================
--- nagios-nrpe/trunk/debian/changelog	2006-03-13 14:56:17 UTC (rev 862)
+++ nagios-nrpe/trunk/debian/changelog	2006-03-31 05:22:06 UTC (rev 863)
@@ -1,8 +1,10 @@
-nagios-nrpe (2.4-2) UNRELEASED; urgency=low
+nagios-nrpe (2.4-2) unstable; urgency=low
 
-  * NOT RELEASED YET
+  [sean finney]
+  * removing nrpe_local.cfg caused trouble for some people, so
+    i've added it back in (closes: #360093).
 
- -- sean finney <seanius at debian.org>  Mon, 13 Mar 2006 15:57:07 +0100
+ -- sean finney <seanius at debian.org>  Fri, 31 Mar 2006 07:02:31 +0200
 
 nagios-nrpe (2.4-1) unstable; urgency=low
 

Modified: nagios-nrpe/trunk/debian/patches/00list
===================================================================
--- nagios-nrpe/trunk/debian/patches/00list	2006-03-13 14:56:17 UTC (rev 862)
+++ nagios-nrpe/trunk/debian/patches/00list	2006-03-31 05:22:06 UTC (rev 863)
@@ -1 +1,2 @@
 01_nodevrandom-and-docoptions.dpatch
+02_nrpe.cfg_local-include.dpatch

Added: nagios-nrpe/trunk/debian/patches/02_nrpe.cfg_local-include.dpatch
===================================================================
--- nagios-nrpe/trunk/debian/patches/02_nrpe.cfg_local-include.dpatch	2006-03-13 14:56:17 UTC (rev 862)
+++ nagios-nrpe/trunk/debian/patches/02_nrpe.cfg_local-include.dpatch	2006-03-31 05:22:06 UTC (rev 863)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_nrpe.cfg_local-include.dpatch by  <seanius at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad nagios-nrpe-2.4~/sample-config/nrpe.cfg.in nagios-nrpe-2.4/sample-config/nrpe.cfg.in
+--- nagios-nrpe-2.4~/sample-config/nrpe.cfg.in	2006-02-03 23:02:32.000000000 +0100
++++ nagios-nrpe-2.4/sample-config/nrpe.cfg.in	2006-03-31 07:07:16.000000000 +0200
+@@ -178,3 +178,8 @@
+ #command[check_load]=@libexecdir@/check_load -w $ARG1$ -c $ARG2$
+ #command[check_disk]=@libexecdir@/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$
+ #command[check_procs]=@libexecdir@/check_procs -w $ARG1$ -c $ARG2$ -s $ARG3$
++
++#
++# local configuration:
++#	if you'd prefer, you can instead place directives here
++include=/etc/nagios/nrpe_local.cfg


Property changes on: nagios-nrpe/trunk/debian/patches/02_nrpe.cfg_local-include.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: nagios-nrpe/trunk/debian/rules
===================================================================
--- nagios-nrpe/trunk/debian/rules	2006-03-13 14:56:17 UTC (rev 862)
+++ nagios-nrpe/trunk/debian/rules	2006-03-31 05:22:06 UTC (rev 863)
@@ -43,6 +43,7 @@
 	dh_installinit -u defaults 30
 	dh_installman
 	dh_install
+	touch debian/nagios-nrpe-server/etc/nagios/nrpe_local.cfg
 	touch install-stamp
 
 binary: binary-indep binary-arch
@@ -59,8 +60,4 @@
 	dh_md5sums
 	dh_builddeb
 
-# this was in the old cdbs rules but i don't think we really need it...
-#binary-post-install/nagios-nrpe-server::
-#	echo -e "\ninclude=/etc/nagios/nrpe_local.cfg" >> debian/nagios-nrpe-server/etc/nagios/nrpe.cfg
-
 .PHONY: binary binary-arch binary-indep clean install