[icinga-checkins] icinga.org: icinga-core/mfriedrich/core: drop unusued daemon-init-redhat initscript (refs #3402)

git at icinga.org git at icinga.org
Sat Oct 27 15:39:36 CEST 2012


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

Author: Michael Friedrich <michael.friedrich at gmail.com>
Date:   Sat Oct 27 15:39:11 2012 +0200

drop unusued daemon-init-redhat initscript (refs #3402)

---

 Makefile.in           |    2 +-
 configure             |    3 +-
 configure.in          |    2 +-
 daemon-init-redhat.in |  119 -------------------------------------------------
 4 files changed, 3 insertions(+), 123 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 69ef3f7..8729eed 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -267,7 +267,7 @@ distclean: clean
 	cd $(SRC_TAP) && $(MAKE) $@; \
 
 	rm -f sample-config/*.cfg sample-config/*.conf sample-config/template-object/*.cfg
-	rm -f daemon-init pkginfo rc.ido2db daemon-init-redhat
+	rm -f daemon-init pkginfo rc.ido2db
 	rm -f include/dh.h
 	rm -f Makefile subst p1.pl
 	rm -f config.log config.status config.cache
diff --git a/configure b/configure
index 2b31d2a..fad5012 100755
--- a/configure
+++ b/configure
@@ -7152,7 +7152,7 @@ $as_echo_n "checking for -Wall based on os/compiler... " >&6; }
         esac
 
 
-ac_config_files="$ac_config_files Makefile subst solaris/pkginfo solaris/icinga.xml base/Makefile common/Makefile contrib/Makefile cgi/Makefile html/Makefile module/Makefile module/idoutils/Makefile xdata/Makefile daemon-init daemon-init-redhat rc.ido2db module/idoutils/src/Makefile t-tap/Makefile t/Makefile module/idoutils/db/scripts/installdb module/idoutils/db/scripts/upgradedb module/idoutils/db/scripts/prepsql p1.pl"
+ac_config_files="$ac_config_files Makefile subst solaris/pkginfo solaris/icinga.xml base/Makefile common/Makefile contrib/Makefile cgi/Makefile html/Makefile module/Makefile module/idoutils/Makefile xdata/Makefile daemon-init rc.ido2db module/idoutils/src/Makefile t-tap/Makefile t/Makefile module/idoutils/db/scripts/installdb module/idoutils/db/scripts/upgradedb module/idoutils/db/scripts/prepsql p1.pl"
 
 
 
@@ -7785,7 +7785,6 @@ do
     "module/idoutils/Makefile") CONFIG_FILES="$CONFIG_FILES module/idoutils/Makefile" ;;
     "xdata/Makefile") CONFIG_FILES="$CONFIG_FILES xdata/Makefile" ;;
     "daemon-init") CONFIG_FILES="$CONFIG_FILES daemon-init" ;;
-    "daemon-init-redhat") CONFIG_FILES="$CONFIG_FILES daemon-init-redhat" ;;
     "rc.ido2db") CONFIG_FILES="$CONFIG_FILES rc.ido2db" ;;
     "module/idoutils/src/Makefile") CONFIG_FILES="$CONFIG_FILES module/idoutils/src/Makefile" ;;
     "t-tap/Makefile") CONFIG_FILES="$CONFIG_FILES t-tap/Makefile" ;;
diff --git a/configure.in b/configure.in
index 7546a63..dd5a37b 100644
--- a/configure.in
+++ b/configure.in
@@ -1313,7 +1313,7 @@ AC_MSG_CHECKING(for -Wall based on os/compiler)
 
 
 dnl OUTPUT
-AC_OUTPUT(Makefile subst solaris/pkginfo solaris/icinga.xml base/Makefile common/Makefile contrib/Makefile cgi/Makefile html/Makefile module/Makefile module/idoutils/Makefile xdata/Makefile daemon-init daemon-init-redhat rc.ido2db module/idoutils/src/Makefile t-tap/Makefile t/Makefile module/idoutils/db/scripts/installdb module/idoutils/db/scripts/upgradedb module/idoutils/db/scripts/prepsql p1.pl)
+AC_OUTPUT(Makefile subst solaris/pkginfo solaris/icinga.xml base/Makefile common/Makefile contrib/Makefile cgi/Makefile html/Makefile module/Makefile module/idoutils/Makefile xdata/Makefile daemon-init rc.ido2db module/idoutils/src/Makefile t-tap/Makefile t/Makefile module/idoutils/db/scripts/installdb module/idoutils/db/scripts/upgradedb module/idoutils/db/scripts/prepsql p1.pl)
 
 perl subst $srcdir/include/locations.h
 
diff --git a/daemon-init-redhat.in b/daemon-init-redhat.in
deleted file mode 100644
index 6e456f4..0000000
--- a/daemon-init-redhat.in
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/bin/sh
-#
-# Icinga	Startup script for the Icinga monitoring daemon
-#
-# chkconfig:	- 85 15
-# description:	Icinga is a service monitoring system
-### BEGIN INIT INFO
-# Provides:		icinga
-# Required-Start:	$local_fs $syslog $network
-# Default-Start:	3 4 5
-# Default-Stop: 	0 1 6
-# Short-Description:    start and stop Icinga monitoring server
-# Description:		Icinga is is a service monitoring system 
-### END INIT INFO
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-prefix="@prefix@"
-exec_prefix="@exec_prefix@"
-exec="@bindir@/icinga"
-prog="icinga"
-config="@sysconfdir@/icinga.cfg"
-pidfile="@lockfile@"
-user="@icinga_user@"
-
-[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
-
-lockfile=/var/lock/subsys/$prog
-
-start() {
-    [ -x $exec ] || exit 5
-    [ -f $config ] || exit 6
-    echo -n $"Starting $prog: "
-    daemon --user=$user $exec -d $config
-    retval=$?
-    echo
-    [ $retval -eq 0 ] && touch $lockfile
-    return $retval
-}
-
-stop() {
-    echo -n $"Stopping $prog: "
-    killproc -p ${pidfile} -d 10 $exec
-    retval=$?
-    echo
-    [ $retval -eq 0 ] && rm -f $lockfile
-    return $retval
-}
-
-
-restart() {
-    stop
-    start
-}
-
-reload() {
-    echo -n $"Reloading $prog: "
-    killproc -p ${pidfile} $exec -HUP
-    RETVAL=$?
-    echo
-}
-
-force_reload() {
-    restart
-}
-
-check_config() {
-        $nice runuser -s /bin/bash - $user -c "$corelimit >/dev/null 2>&1 ; $exec -v $config > /dev/null 2>&1"
-	RETVAL=$?
-        if [ $RETVAL -ne 0 ] ; then
-                echo -n $"Configuration validation failed"
-                failure
-                echo
-                exit 1
-        fi
-}
-
-case "$1" in
-    start)
-        status $prog && exit 0
-	check_config
-        $1
-        ;;
-    stop)
-        status $prog|| exit 0
-        $1
-        ;;
-    restart)
-	check_config
-        $1
-        ;;
-    reload)
-        status $prog || exit 7
-	check_config
-        $1
-        ;;
-    force-reload)
-        force_reload
-        ;;
-    status)
-        status $prog
-        ;;
-    condrestart|try-restart)
-        status $prog|| exit 0
-        restart
-        ;;
-   configtest)
-        echo -n  $"Checking config for $prog: "
-        check_config && success
-        echo
-
-	;;
-    *)
-        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload|configtest}"
-        exit 2
-esac
-exit $?
-





More information about the icinga-checkins mailing list