[icinga-checkins] icinga.org: icinga-core/master: daemonchk. cgi was never used since $IcingaCGI is not $IcingaCGIDir

git at icinga.org git at icinga.org
Wed Jul 28 20:44:05 CEST 2010


Module: icinga-core
Branch: master
Commit: 0d2f5f1ec4f0d811312c62300d145ec7ea2a34d7
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=0d2f5f1ec4f0d811312c62300d145ec7ea2a34d7

Author: Christoph Maser <cmr at financial.com>
Date:   Sun Jul 25 00:07:24 2010 +0200

daemonchk.cgi was never used since $IcingaCGI is not $IcingaCGIDir

---

 daemon-init.in |   25 ++++++++-----------------
 1 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/daemon-init.in b/daemon-init.in
index d3681b4..9dfee79 100644
--- a/daemon-init.in
+++ b/daemon-init.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-# 
+#
 # chkconfig: 345 99 01
 # description: Icinga network monitor
 ### BEGIN INIT INFO
@@ -11,22 +11,14 @@
 # Short-Description: start and stop Icinga monitoring daemon
 # Description: Icinga is a service monitoring system
 ### END INIT INFO
-  
+
 status_icinga ()
 {
 
-	if test -x $IcingaCGI/daemonchk.cgi; then
-		if $IcingaCGI/daemonchk.cgi -l $IcingaRunFile; then
-		        return 0
-		else
-			return 1
-		fi
+	if ps -p $IcingaPID > /dev/null 2>&1; then
+	        return 0
 	else
-		if ps -p $IcingaPID > /dev/null 2>&1; then
-		        return 0
-		else
-			return 1
-		fi
+		return 1
 	fi
 
 	return 1
@@ -101,11 +93,10 @@ IcingaVarDir=@localstatedir@
 IcingaRunFile=@lockfile@
 IcingaLockDir=/var/lock/subsys
 IcingaLockFile=icinga
-IcingaCGIDir=@sbindir@
 IcingaUser=@icinga_user@
 IcingaGroup=@icinga_grp@
 IcingaChkFile=@localstatedir@/icinga.chk
-          
+
 
 # Check that icinga exists.
 if [ ! -f $IcingaBin ]; then
@@ -144,7 +135,7 @@ start(){
 	exit 0
 
 }
-          
+
 # See how we were called.
 case "$1" in
 
@@ -225,5 +216,5 @@ case "$1" in
 		;;
 
 esac
-  
+
 # End of this script





More information about the icinga-checkins mailing list