[Pkg-nagios-changes] [pkg-nagios] r1551 - in nagios3/trunk/debian: . patches

Tue Aug 5 08:06:03 UTC 2008

tags 493790 pending
thanks

Author: formorer
Date: 2008-08-05 08:06:03 +0000 (Tue, 05 Aug 2008)
New Revision: 1551

Added:
   nagios3/trunk/debian/patches/70_fix_eventhandler_paths.dpatch
Modified:
   nagios3/trunk/debian/changelog
   nagios3/trunk/debian/patches/00list
Log:
Fix helper paths in eventhandlers


Modified: nagios3/trunk/debian/changelog
===================================================================

--- nagios3/trunk/debian/changelog	2008-07-31 21:20:59 UTC (rev 1550)
+++ nagios3/trunk/debian/changelog	2008-08-05 08:06:03 UTC (rev 1551)
@@ -1,13 +1,9 @@
-nagios3 (3.0.3-4) unstable; urgency=low
+nagios3 (3.0.3-3) unreleased; urgency=low
 
+  * Create /var/lib/nagios3/spool/checkresults (Closes: #492201)
   * Refer to nagios-plugins-basic instead of nagios-plugins in commands.cfg
     (Closes: #493107) 
-
- -- Alexander Wirt <formorer at debian.org>  Thu, 31 Jul 2008 23:19:27 +0200
-
-nagios3 (3.0.3-3) unstable; urgency=low
-
-  * Create /var/lib/nagios3/spool/checkresults (Closes: #492201)
+  * Fix helper paths in contributed eventhandlers (Closes: #493790)
  
  -- Alexander Wirt <formorer at debian.org>  Thu, 24 Jul 2008 13:29:05 +0200
 

Modified: nagios3/trunk/debian/patches/00list
===================================================================
--- nagios3/trunk/debian/patches/00list	2008-07-31 21:20:59 UTC (rev 1550)
+++ nagios3/trunk/debian/patches/00list	2008-08-05 08:06:03 UTC (rev 1551)
@@ -5,3 +5,4 @@
 51_commands.cfg-debianize.dpatch
 52_nagios.cfg-debianize.dpatch
 60_fix_p1.pl_patch_mini_epn.dpatch
+70_fix_eventhandler_paths.dpatch

Added: nagios3/trunk/debian/patches/70_fix_eventhandler_paths.dpatch
===================================================================
--- nagios3/trunk/debian/patches/70_fix_eventhandler_paths.dpatch	                        (rev 0)
+++ nagios3/trunk/debian/patches/70_fix_eventhandler_paths.dpatch	2008-08-05 08:06:03 UTC (rev 1551)
@@ -0,0 +1,140 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 70_fix_eventhandler_paths.dpatch by Alexander Wirt <formorer at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes paths for all contributed eventhandlers
+
+ at DPATCH@
+diff -urNad nagios3-3.0.3~/contrib/eventhandlers/disable_active_service_checks nagios3-3.0.3/contrib/eventhandlers/disable_active_service_checks
+--- nagios3-3.0.3~/contrib/eventhandlers/disable_active_service_checks	2008-05-19 20:01:59.000000000 +0200
++++ nagios3-3.0.3/contrib/eventhandlers/disable_active_service_checks	2008-08-05 09:56:27.000000000 +0200
+@@ -14,9 +14,9 @@
+ #    the check_external_commands option in the main
+ #    configuration file.
+ 
+-printfcmd="/bin/printf"
++printfcmd="/usr/usr/usr/bin/printf"
+ 
+-CommandFile="/usr/local/nagios/var/rw/nagios.cmd"
++CommandFile="/var/lib/nagios3/rw/nagios.cmd"
+ 
+ # get the current date/time in seconds since UNIX epoch
+ datetime=`date +%s`
+diff -urNad nagios3-3.0.3~/contrib/eventhandlers/disable_notifications nagios3-3.0.3/contrib/eventhandlers/disable_notifications
+--- nagios3-3.0.3~/contrib/eventhandlers/disable_notifications	2008-01-24 13:34:57.000000000 +0100
++++ nagios3-3.0.3/contrib/eventhandlers/disable_notifications	2008-08-05 09:56:27.000000000 +0200
+@@ -12,9 +12,9 @@
+ #    the check_external_commands option in the main
+ #    configuration file.
+ 
+-printfcmd="/bin/printf"
++printfcmd="/usr/usr/usr/bin/printf"
+ 
+-CommandFile="/usr/local/nagios/var/rw/nagios.cmd"
++CommandFile="/var/lib/nagios3/rw/nagios.cmd"
+ 
+ # get the current date/time in seconds since UNIX epoch
+ datetime=`date +%s`
+diff -urNad nagios3-3.0.3~/contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler nagios3-3.0.3/contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler
+--- nagios3-3.0.3~/contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler	2002-02-26 05:03:37.000000000 +0100
++++ nagios3-3.0.3/contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler	2008-08-05 09:57:54.000000000 +0200
+@@ -21,7 +21,7 @@
+ #
+ 
+ # Location of the submit_check_result_via_nsca script
+-SubmitCmd="/usr/local/nagios/libexec/eventhandlers/submit_check_result_via_nsca"
++SubmitCmd="/usr/share/nagios3/plugins/eventhandlers/distributed-monitoring/submit_check_result_via_nsca"
+ 
+ # Convert the state string to the corresponding return code
+ return_code=-1
+diff -urNad nagios3-3.0.3~/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca nagios3-3.0.3/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca
+--- nagios3-3.0.3~/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca	2008-04-14 17:55:06.000000000 +0200
++++ nagios3-3.0.3/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca	2008-08-05 09:58:47.000000000 +0200
+@@ -26,10 +26,10 @@
+ # IP address of the central server that has the nsca
+ # daemon running.
+ 
+-printfcmd="/bin/printf"
++printfcmd="/usr/bin/printf"
+ 
+-NscaBin="/usr/local/nagios/libexec/send_nsca" 
+-NscaCfg="/usr/local/nagios/etc/send_nsca.cfg"
++NscaBin="/usr/sbin/send_nsca"
++NscaCfg="/etc/send_nsca.cfg"
+ NagiosHost="nagioshost"
+ 
+ # Fire the data off to the NSCA daemon using the send_nsca script 
+diff -urNad nagios3-3.0.3~/contrib/eventhandlers/enable_active_service_checks nagios3-3.0.3/contrib/eventhandlers/enable_active_service_checks
+--- nagios3-3.0.3~/contrib/eventhandlers/enable_active_service_checks	2008-05-19 20:01:59.000000000 +0200
++++ nagios3-3.0.3/contrib/eventhandlers/enable_active_service_checks	2008-08-05 09:56:27.000000000 +0200
+@@ -14,9 +14,9 @@
+ #    the check_external_commands option in the main
+ #    configuration file.
+ 
+-printfcmd="/bin/printf"
++printfcmd="/usr/usr/bin/printf"
+ 
+-CommandFile="/usr/local/nagios/var/rw/nagios.cmd"
++CommandFile="/var/lib/nagios3/rw/nagios.cmd"
+ 
+ # get the current date/time in seconds since UNIX epoch
+ datetime=`date +%s`
+diff -urNad nagios3-3.0.3~/contrib/eventhandlers/enable_notifications nagios3-3.0.3/contrib/eventhandlers/enable_notifications
+--- nagios3-3.0.3~/contrib/eventhandlers/enable_notifications	2008-01-24 13:34:57.000000000 +0100
++++ nagios3-3.0.3/contrib/eventhandlers/enable_notifications	2008-08-05 09:56:27.000000000 +0200
+@@ -12,9 +12,9 @@
+ #    the check_external_commands option in the main
+ #    configuration file.
+ 
+-printfcmd="/bin/printf"
++printfcmd="/usr/bin/printf"
+ 
+-CommandFile="/usr/local/nagios/var/rw/nagios.cmd"
++CommandFile="/var/lib/nagios3/rw/nagios.cmd"
+ 
+ # get the current date/time in seconds since UNIX epoch
+ datetime=`date +%s`
+diff -urNad nagios3-3.0.3~/contrib/eventhandlers/redundancy-scenario1/handle-master-host-event nagios3-3.0.3/contrib/eventhandlers/redundancy-scenario1/handle-master-host-event
+--- nagios3-3.0.3~/contrib/eventhandlers/redundancy-scenario1/handle-master-host-event	2004-02-20 05:37:01.000000000 +0100
++++ nagios3-3.0.3/contrib/eventhandlers/redundancy-scenario1/handle-master-host-event	2008-08-05 09:59:37.000000000 +0200
+@@ -10,10 +10,10 @@
+ 
+ # Location of the echo and mail commands
+ echocmd="/bin/echo"
+-mailcmd="/bin/mail"
++mailcmd="/usr/bin/mail"
+ 
+ # Location of the event handlers
+-eventhandlerdir="/usr/local/nagios/libexec/eventhandlers"
++eventhandlerdir="/usr/share/nagios3/plugins/eventhandlers"
+ 
+ 
+ # Only take action on hard host states...
+diff -urNad nagios3-3.0.3~/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event nagios3-3.0.3/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event
+--- nagios3-3.0.3~/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event	2006-05-30 18:38:01.000000000 +0200
++++ nagios3-3.0.3/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event	2008-08-05 09:59:59.000000000 +0200
+@@ -10,10 +10,10 @@
+ 
+ # Location of the echo and mail commands
+ echocmd="/bin/echo"
+-mailcmd="/bin/mail"
++mailcmd="/usr/bin/mail"
+ 
+ # Location of the event handlers
+-eventhandlerdir="/usr/local/nagios/libexec/eventhandlers"
++eventhandlerdir="/usr/share/nagios3/plugins/eventhandlers"
+ 
+ 
+ # Only take action on hard service states...
+diff -urNad nagios3-3.0.3~/contrib/eventhandlers/submit_check_result nagios3-3.0.3/contrib/eventhandlers/submit_check_result
+--- nagios3-3.0.3~/contrib/eventhandlers/submit_check_result	2002-02-26 05:03:37.000000000 +0100
++++ nagios3-3.0.3/contrib/eventhandlers/submit_check_result	2008-08-05 09:56:27.000000000 +0200
+@@ -24,7 +24,7 @@
+  
+ echocmd="/bin/echo"
+  
+-CommandFile="/usr/local/nagios/var/rw/nagios.cmd"
++CommandFile="/var/lib/nagios3/rw/nagios.cmd"
+  
+ # get the current date/time in seconds since UNIX epoch
+ datetime=`date +%s`


Property changes on: nagios3/trunk/debian/patches/70_fix_eventhandler_paths.dpatch
___________________________________________________________________
Name: svn:executable
   + *


