[Pkg-nagios-changes] [pkg-nagios] r1789 - nagios3/trunk/debian

[Alexander Wirt]

Author: formorer
Date: 2009-11-16 22:03:51 +0000 (Mon, 16 Nov 2009)
New Revision: 1789

Modified:
   nagios3/trunk/debian/changelog
   nagios3/trunk/debian/nagios3-common.nagios3.init
Log:
Fix initscript


Modified: nagios3/trunk/debian/changelog
===================================================================
--- nagios3/trunk/debian/changelog	2009-11-12 01:19:50 UTC (rev 1788)
+++ nagios3/trunk/debian/changelog	2009-11-16 22:03:51 UTC (rev 1789)
@@ -1,9 +1,13 @@
 nagios3 (3.2.0-5) UNRELEASED; urgency=low
 
+  [ Jan Wagner ]
   * Add Close to last changelog entry
 
- -- Jan Wagner <waja at cyconet.org>  Wed, 11 Nov 2009 20:18:07 +0100
+  [ Alexander Wirt ]
+  * Don't rely on nagios3-cgi in initscript 
 
+ -- Alexander Wirt <formorer at debian.org>  Mon, 16 Nov 2009 23:02:38 +0100
+
 nagios3 (3.2.0-4) unstable; urgency=low
 
   * Add nagios3-doc to Replaces in nagios3-cgi (Closes: 551813)

Modified: nagios3/trunk/debian/nagios3-common.nagios3.init
===================================================================
--- nagios3/trunk/debian/nagios3-common.nagios3.init	2009-11-12 01:19:50 UTC (rev 1788)
+++ nagios3/trunk/debian/nagios3-common.nagios3.init	2009-11-16 22:03:51 UTC (rev 1789)
@@ -51,11 +51,18 @@
 }
 
 check_started () {
-  check_cmd=$(get_config nagios_check_command $CGICFG)
-  if [ ! "$check_cmd" ]; then
-    log 6 "unable to determine nagios_check_command from $CGICFG!" 
-    return 6
-  fi
+	#nagios3-core can be installed without -cgi
+	if [ -e $CGICFG ];
+	then
+		check_cmd=$(get_config nagios_check_command $CGICFG)
+		if [ ! "$check_cmd" ]; then
+			log 6 "unable to determine nagios_check_command from $CGICFG!" 
+			return 6
+		fi
+	else 
+		#use hardcoded default version
+		check_cmd="/usr/lib/nagios/plugins/check_nagios /var/cache/nagios3/status.dat 5 '/usr/sbin/nagios3'"
+	fi
 
   eval $check_cmd >/dev/null