Debian: Cleaned up indention in init script.

Refs #5305

Conflicts:
	debian/icinga2-common.icinga2.init
This commit is contained in:
Markus Frosch 2013-12-11 15:34:29 +01:00
parent 16e1da530f
commit 6200c8164c

View File

@ -40,18 +40,18 @@ SCRIPTNAME=/etc/init.d/$NAME
# check run directory # check run directory
check_run () { check_run () {
test -d '/var/run/icinga2' || mkdir /var/run/icinga2 test -d '/var/run/icinga2' || mkdir /var/run/icinga2
test -d '/var/run/icinga2/cmd' || mkdir /var/run/icinga2/cmd test -d '/var/run/icinga2/cmd' || mkdir /var/run/icinga2/cmd
chown nagios:nagios /var/run/icinga2 chown nagios:nagios /var/run/icinga2
chmod 0755 /var/run/icinga2 chmod 0755 /var/run/icinga2
chown nagios:www-data /var/run/icinga2/cmd chown nagios:www-data /var/run/icinga2/cmd
chmod 2710 /var/run/icinga2/cmd chmod 2710 /var/run/icinga2/cmd
} }
check_config () { check_config () {
$DAEMON --validate -u "$DAEMON_USER" -g "$DAEMON_GROUP" -c "$DAEMON_CONFIG" $DAEMON --validate -u "$DAEMON_USER" -g "$DAEMON_GROUP" -c "$DAEMON_CONFIG"
} }
# #
@ -59,18 +59,18 @@ check_config () {
# #
do_start() do_start()
{ {
# Return # Return
# 0 if daemon has been started # 0 if daemon has been started
# 1 if daemon was already running # 1 if daemon was already running
# 2 if daemon could not be started # 2 if daemon could not be started
start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
|| return 1 || return 1
start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
-c "$DAEMON_CONFIG" -u "$DAEMON_USER" -g "$DAEMON_GROUP" -d $DAEMON_ARGS \ -c "$DAEMON_CONFIG" -u "$DAEMON_USER" -g "$DAEMON_GROUP" -d $DAEMON_ARGS \
|| return 2 || return 2
# Add code here, if necessary, that waits for the process to be ready # Add code here, if necessary, that waits for the process to be ready
# to handle requests from services started subsequently which depend # to handle requests from services started subsequently which depend
# on this one. As a last resort, sleep for some time. # on this one. As a last resort, sleep for some time.
} }
# #
@ -78,52 +78,52 @@ do_start()
# #
do_stop() do_stop()
{ {
# Return # Return
# 0 if daemon has been stopped # 0 if daemon has been stopped
# 1 if daemon was already stopped # 1 if daemon was already stopped
# 2 if daemon could not be stopped # 2 if daemon could not be stopped
# other if a failure occurred # other if a failure occurred
start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
RETVAL="$?" RETVAL="$?"
[ "$RETVAL" = 2 ] && return 2 [ "$RETVAL" = 2 ] && return 2
# Wait for children to finish too if this is a daemon that forks # Wait for children to finish too if this is a daemon that forks
# and if the daemon is only ever run from this initscript. # and if the daemon is only ever run from this initscript.
# If the above conditions are not satisfied then add some other code # If the above conditions are not satisfied then add some other code
# that waits for the process to drop all resources that could be # that waits for the process to drop all resources that could be
# needed by services started subsequently. A last resort is to # needed by services started subsequently. A last resort is to
# sleep for some time. # sleep for some time.
start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON
[ "$?" = 2 ] && return 2 [ "$?" = 2 ] && return 2
# Many daemons don't delete their pidfiles when they exit. # Many daemons don't delete their pidfiles when they exit.
rm -f $PIDFILE rm -f $PIDFILE
return "$RETVAL" return "$RETVAL"
} }
# #
# Function that sends a SIGHUP to the daemon/service # Function that sends a SIGHUP to the daemon/service
# #
do_reload() { do_reload() {
# #
# If the daemon can reload its configuration without # If the daemon can reload its configuration without
# restarting (for example, when it is sent a SIGHUP), # restarting (for example, when it is sent a SIGHUP),
# then implement that here. # then implement that here.
# #
start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME
return 0 return 0
} }
do_check_config () { do_check_config () {
DOEXITONOK="$1" DOEXITONOK="$1"
log_begin_msg "checking Icinga2 configuration" log_begin_msg "checking Icinga2 configuration"
if ! check_config >/dev/null 2>&1; then if ! check_config >/dev/null 2>&1; then
echo echo
check_config check_config
log_failure_msg "checking Icinga2 configuration" log_failure_msg "checking Icinga2 configuration"
exit 1 exit 1
else else
log_end_msg 0 log_end_msg 0
[ -n "$DOEXITONOK" ] && exit 0 [ -n "$DOEXITONOK" ] && exit 0
fi fi
} }
check_run check_run
@ -131,56 +131,57 @@ check_run
case "$1" in case "$1" in
start) start)
do_check_config do_check_config
log_daemon_msg "Starting $DESC" "$NAME" log_daemon_msg "Starting $DESC" "$NAME"
do_start do_start
case "$?" in case "$?" in
0|1) log_end_msg 0 ;; 0|1) log_end_msg 0 ;;
2) log_end_msg 1 ;; 2) log_end_msg 1 ;;
esac esac
;; ;;
stop) stop)
log_daemon_msg "Stopping $DESC" "$NAME" log_daemon_msg "Stopping $DESC" "$NAME"
do_stop do_stop
case "$?" in case "$?" in
0|1) log_end_msg 0 ;; 0|1) log_end_msg 0 ;;
2) log_end_msg 1 ;; 2) log_end_msg 1 ;;
esac esac
;; ;;
status) status)
status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
;; ;;
reload|force-reload) reload|force-reload)
do_check_config do_check_config
log_daemon_msg "Reloading $DESC" "$NAME" log_daemon_msg "Reloading $DESC" "$NAME"
do_reload do_reload
log_end_msg $? log_end_msg $?
;; ;;
restart) restart)
do_check_config do_check_config
log_daemon_msg "Restarting $DESC" "$NAME" log_daemon_msg "Restarting $DESC" "$NAME"
do_stop do_stop
case "$?" in case "$?" in
0|1) 0|1)
do_start do_start
case "$?" in case "$?" in
0) log_end_msg 0 ;; 0) log_end_msg 0 ;;
1) log_end_msg 1 ;; # Old process is still running 1) log_end_msg 1 ;; # Old process is still running
*) log_end_msg 1 ;; # Failed to start *) log_end_msg 1 ;; # Failed to start
esac esac
;; ;;
*) *)
# Failed to stop # Failed to stop
log_end_msg 1 log_end_msg 1
;; ;;
esac esac
;; ;;
checkconfig) checkconfig)
do_check_config 1 do_check_config 1
;; ;;
*) *)
echo "Usage: $SCRIPTNAME {start|stop|status|reload|force-reload|restart|checkconfig}" >&2 echo "Usage: $SCRIPTNAME {start|stop|status|reload|force-reload|restart|checkconfig}" >&2
exit 3 exit 3
;; ;;
esac esac
# vi: ts=2 sw=2 expandtab :
: :