[Pkg-nagios-devel] nagios nagios-common.nagios.init,NONE,1.1 changelog,1.13,1.14 nagios-common.init.d,1.3,NONE

[joerg@haydn.debian.org]

Update of /cvsroot/pkg-nagios/nagios
In directory haydn:/tmp/cvs-serv25243

Modified Files:
	changelog 
Added Files:
	nagios-common.nagios.init 
Removed Files:
	nagios-common.init.d 
Log Message:
Wah, init script name was wrong and I somehow missed this.



--- NEW FILE: nagios-common.nagios.init ---
#! /bin/sh
#
# skeleton	example file to build /etc/init.d/ scripts.
#		This file should be used to construct scripts for /etc/init.d.
#
#		Written by Miquel van Smoorenburg <miquels@cistron.nl>.
#		Modified for Debian GNU/Linux
#		by Ian Murdock <imurdock@gnu.ai.mit.edu>.
#
# Version:	@(#)skeleton  1.8  03-Mar-1998  miquels@cistron.nl
#
# This file was automatically customized by dh-make on Mon, 17 Jan 2000 19:30:36 +0000
# Hacked into netsaint shape by bjb.

PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
DAEMON=/usr/sbin/nagios
NAME=nagios
DESC=nagios
NICENESS=5
NAMEDPIPE=/var/run/nagios/nagios.cmd
PIDFILE=/var/run/nagios/nagios.pid
CONFIG=/etc/nagios/nagios.cfg

test -f $DAEMON || exit 0

set -e

#
# Is this function useful at all?
# start-stop-daemon should handle this work!
#
check_started () {
    if [ -f /etc/nagios/check_nagios_db ]; then
 	if /etc/nagios/check_nagios_db > /dev/null; then
 	    return 0    # Is started
 	else
 	    return 1    # Isn't started
 	fi
    elif [ -f /usr/lib/nagios/plugins/check_nagios ]; then
	if /usr/lib/nagios/plugins/check_nagios -F /var/log/nagios/status.log -e 5 -C 'nagios' > /dev/null; then
	    return 0    # Is started
	else
	    return 1    # Isn't started
	fi
    elif [ -f /usr/lib/netsaint/plugins/check_netsaint ]; then
	if /usr/lib/netsaint/plugins/check_netsaint -F /var/log/nagios/status.log -e 5 -C 'nagios' > /dev/null; then
	    return 0    # Is started
	else
	    return 1    # Isn't started
	fi
    elif [ -f $PIDFILE ]; then
    	# Try discovering if nagios is alive checking its pid
	if kill -CHLD $( cat $PIDFILE ) ; then
	    return 1    # Isn't started
	else
	    return 0    # Is started
	fi
    else
    	return 1	# Isn't started
    fi
}

get_config () {
    set -- `grep ^$1 $CONFIG | sed 's@=@ @'`
    echo $2
}

check_config () {
    if $DAEMON -v $CONFIG >/dev/null 2>&1 ; then
	# First get the user/group etc Nagios is running as
	nagios_user=`get_config nagios_user`
	nagios_group=`get_config nagios_group`
	log_file=`get_config log_file`
	log_dir=`dirname $log_file`

	# Chown the log directory to this user/group so that
	# Nagios can write there.
	chown -R $nagios_user.$nagios_group $log_dir

	return 0    # Config is ok
    else
    	# config is not okay, so let's barf the error to the user
        $DAEMON -v $CONFIG
	return 1    # Config not ok
    fi
}

check_named_pipe () {
    if [ -p $NAMEDPIPE ]; then
	return 1   # a named pipe exists
    else
	return 0   # no named pipe exists
    fi
}

case "$1" in
  start)
	echo -n "Starting $DESC: "
	if ! check_started; then
	    if ! check_named_pipe; then
		echo "named pipe exists - removing"
		rm -f $NAMEDPIPE
	    fi

	    if check_config; then
		rm -f $NAMEDPIPE		
	    start-stop-daemon --start --quiet \
			--nicelevel $NICENESS \
		    --pidfile $PIDFILE \
		    --make-pidfile --background --exec $DAEMON -- $CONFIG
		echo "$NAME."
	    else
		echo "errors in config!"
	    fi
	else
	    echo "already running"
	fi
	;;
  stop)
	echo -n "Stopping $DESC: "
	start-stop-daemon --stop --quiet --pidfile $PIDFILE \
		--oknodo --exec $DAEMON
	echo "$NAME."
	rm -f $PIDFILE
	rm -f $NAMEDPIPE
	;;
  reload|force-reload)
	echo "Reloading $DESC configuration files."
	# Check first
	if check_config; then
	    if check_started; then
		start-stop-daemon --stop --signal 1 --quiet --pidfile \
		    $PIDFILE --exec $DAEMON
	    else
		echo "Not running."
	    fi
	else
	    echo "Errors in config file. Not reloading."
	fi
  	;;
  restart)
	echo -n "Restarting $DESC: "
	$0 stop
	sleep 2
	$0 start
	;;
  *)
	N=/etc/init.d/$NAME
	echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
	exit 1
	;;
esac

exit 0

Index: changelog
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/changelog,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- changelog	14 Nov 2004 13:07:57 -0000	1.13
+++ changelog	14 Nov 2004 23:11:57 -0000	1.14
@@ -1,3 +1,11 @@
+nagios (2:1.3-0+pre1) experimental; urgency=low
+
+  * Joerg Jaspert:
+    - Bah, init script had the wrong name for dh_installinit and I somehow missed
+      to notice that. Changed, thanks to Dagfinn Ilmari Mannsåker
+
+ -- Joerg Jaspert <joerg@debian.org>  Mon, 15 Nov 2004 00:04:03 +0100
+
 nagios (2:1.3-0+pre) experimental; urgency=low
 
   * Joerg Jaspert:

--- nagios-common.init.d DELETED ---