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

[Alexander Wirt]

tags 508439 pending
thanks

Author: formorer
Date: 2009-03-12 06:42:26 +0000 (Thu, 12 Mar 2009)
New Revision: 1626

Modified:
   nagios3/trunk/debian/changelog
   nagios3/trunk/debian/patches/50_cgi.cfg-debianize.dpatch
Log:
Readd docs for nagios_check_command


Modified: nagios3/trunk/debian/changelog
===================================================================
--- nagios3/trunk/debian/changelog	2009-03-12 06:38:07 UTC (rev 1625)
+++ nagios3/trunk/debian/changelog	2009-03-12 06:42:26 UTC (rev 1626)
@@ -8,6 +8,7 @@
     (Closes: #515260)
   * Remove rw pipe even if it is a file (Closes: #495236) 
   * Move debug log to /var/log (Closes: #502080)
+  * Readd documentation for nagios_check_command (Closes: #508439)
 
  -- Alexander Wirt <formorer at debian.org>  Thu, 12 Mar 2009 07:25:17 +0100
 

Modified: nagios3/trunk/debian/patches/50_cgi.cfg-debianize.dpatch
===================================================================
--- nagios3/trunk/debian/patches/50_cgi.cfg-debianize.dpatch	2009-03-12 06:38:07 UTC (rev 1625)
+++ nagios3/trunk/debian/patches/50_cgi.cfg-debianize.dpatch	2009-03-12 06:42:26 UTC (rev 1626)
@@ -5,9 +5,9 @@
 ## DP: Debianize cgi.cfg
 
 @DPATCH@
-diff -urNad pkg-nagios3~/sample-config/cgi.cfg.in pkg-nagios3/sample-config/cgi.cfg.in
---- pkg-nagios3~/sample-config/cgi.cfg.in	2007-10-07 21:42:52.000000000 +0200
-+++ pkg-nagios3/sample-config/cgi.cfg.in	2008-07-12 08:34:25.000000000 +0200
+diff -urNad nagios3-3.0.6~/sample-config/cgi.cfg.in nagios3-3.0.6/sample-config/cgi.cfg.in
+--- nagios3-3.0.6~/sample-config/cgi.cfg.in	2008-11-30 19:13:11.000000000 +0100
++++ nagios3-3.0.6/sample-config/cgi.cfg.in	2009-03-12 07:39:50.000000000 +0100
 @@ -43,7 +43,7 @@
  # Values: 0 = disables context-sensitive help
  #         1 = enables context-sensitive help
@@ -17,11 +17,25 @@
  
  
  
-@@ -55,7 +55,7 @@
+@@ -55,7 +55,22 @@
  
  use_pending_states=1
  
--
++# NAGIOS PROCESS CHECK COMMAND
++# This is the full path and filename of the program used to check
++# the status of the Nagios process.  It is used only by the CGIs
++# and is completely optional.  However, if you don't use it, you'll
++# see warning messages in the CGIs about the Nagios process
++# not running and you won't be able to execute any commands from
++# the web interface.  The program should follow the same rules
++# as plugins; the return codes are the same as for the plugins,
++# it should have timeout protection, it should output something
++# to STDIO, etc.
++#
++# Note: The command line for the check_nagios plugin below may
++# have to be tweaked a bit, as different versions of the plugin
++# use different command line arguments/syntaxes.
+ 
 +nagios_check_command=/usr/lib/nagios/plugins/check_nagios /var/cache/nagios3/status.dat 5 '/usr/sbin/nagios3'