From d935c2a784c375f32d2238a36f63c74496d5636c Mon Sep 17 00:00:00 2001 From: Tails developers Date: Tue, 23 Oct 2012 18:37:23 +0200 Subject: Add warnings for file that are managed by Puppet --- files/inoticoming.init | 3 +++ 1 file changed, 3 insertions(+) (limited to 'files/inoticoming.init') diff --git a/files/inoticoming.init b/files/inoticoming.init index e16ffd1..3c14d83 100755 --- a/files/inoticoming.init +++ b/files/inoticoming.init @@ -1,4 +1,7 @@ #! /bin/sh +# +# This file is managed by Puppet. Do not edit, any changes will be overwritten! +# ### BEGIN INIT INFO # Provides: reprepro # Required-Start: $local_fs $syslog -- cgit v1.2.3 From f3dd82b3fa0284435d77587a874f06790aca45e7 Mon Sep 17 00:00:00 2001 From: Tails developers Date: Sat, 3 Nov 2012 18:14:16 +0100 Subject: Fix boot dependencies in initscript inoticoming lies in /usr/bin so it needs $remote_fs and not $local_fs. --- files/inoticoming.init | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'files/inoticoming.init') diff --git a/files/inoticoming.init b/files/inoticoming.init index 3c14d83..aa5c9bb 100755 --- a/files/inoticoming.init +++ b/files/inoticoming.init @@ -4,8 +4,8 @@ # ### BEGIN INIT INFO # Provides: reprepro -# Required-Start: $local_fs $syslog -# Required-Stop: $local_fs $syslog +# Required-Start: $remote_fs $syslog +# Required-Stop: $remote_fs $syslog # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: Reprepro startup script for inoticoming support -- cgit v1.2.3 From d4088ff2df020e4b7136b166d06bb7427aecb183 Mon Sep 17 00:00:00 2001 From: Tails developers Date: Sat, 3 Nov 2012 18:15:08 +0100 Subject: Improve descriptions in initscript --- files/inoticoming.init | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'files/inoticoming.init') diff --git a/files/inoticoming.init b/files/inoticoming.init index aa5c9bb..c1492d5 100755 --- a/files/inoticoming.init +++ b/files/inoticoming.init @@ -8,8 +8,9 @@ # Required-Stop: $remote_fs $syslog # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 -# Short-Description: Reprepro startup script for inoticoming support -# Description: This script an instance of inoticoming via an initscript. +# Short-Description: reprepro incoming queue monitor +# Description: Monitors the incoming queue for the package repository +# managed by reprepro. ### END INIT INFO # Copyright (c) 2008 by Tilman Koschnick -- cgit v1.2.3 From 48c91948481edabecae5fd386c10ebc83a7de0cb Mon Sep 17 00:00:00 2001 From: Tails developers Date: Sat, 3 Nov 2012 18:15:56 +0100 Subject: Remove useless boilerplate from skeleton initscript --- files/inoticoming.init | 5 ----- 1 file changed, 5 deletions(-) (limited to 'files/inoticoming.init') diff --git a/files/inoticoming.init b/files/inoticoming.init index c1492d5..d158519 100755 --- a/files/inoticoming.init +++ b/files/inoticoming.init @@ -13,13 +13,8 @@ # managed by reprepro. ### END INIT INFO -# Copyright (c) 2008 by Tilman Koschnick -# Based on /etc/init.d/skeleton from Debian package initscripts -# Distributed under the GPLv2 - # Do NOT "set -e" -# PATH should only include /usr/* if it runs after the mountnfs.sh script PATH=/sbin:/usr/sbin:/bin:/usr/bin DESC="reprepro incoming queue monitor" NAME=reprepro -- cgit v1.2.3 From a8874b34b39e0f2ce460db0d8acc4e9ef1843027 Mon Sep 17 00:00:00 2001 From: Tails developers Date: Sat, 3 Nov 2012 18:17:47 +0100 Subject: Adjust whitespaces in initscripts --- files/inoticoming.init | 138 ++++++++++++++++++++++++------------------------- 1 file changed, 69 insertions(+), 69 deletions(-) (limited to 'files/inoticoming.init') diff --git a/files/inoticoming.init b/files/inoticoming.init index d158519..e66bb94 100755 --- a/files/inoticoming.init +++ b/files/inoticoming.init @@ -40,31 +40,31 @@ SCRIPTNAME=/etc/init.d/$NAME # do_start() { - # Return - # 0 if daemon has been started - # 1 if daemon was already running - # 2 if daemon could not be started + # Return + # 0 if daemon has been started + # 1 if daemon was already running + # 2 if daemon could not be started - # make sure inoticoming can write the PID to $PIDFILE - [ -f $PIDFILE ] || touch $PIDFILE - chown $USER $PIDFILE - OPTIONS="--pid-file $PIDFILE" + # make sure inoticoming can write the PID to $PIDFILE + [ -f $PIDFILE ] || touch $PIDFILE + chown $USER $PIDFILE + OPTIONS="--pid-file $PIDFILE" - # make sure inoticoming can write to $LOGFILE - if [ -n $LOGFILE ] ; then - [ -f $LOGFILE ] || touch $LOGFILE - chown $USER $LOGFILE - OPTIONS="$OPTIONS --logfile $LOGFILE" - fi + # make sure inoticoming can write to $LOGFILE + if [ -n $LOGFILE ] ; then + [ -f $LOGFILE ] || touch $LOGFILE + chown $USER $LOGFILE + OPTIONS="$OPTIONS --logfile $LOGFILE" + fi - # should we do an initial search of the directory? - [ "$INITIALSEARCH" != "0" ] && OPTIONS="$OPTIONS --initialsearch" + # should we do an initial search of the directory? + [ "$INITIALSEARCH" != "0" ] && OPTIONS="$OPTIONS --initialsearch" - start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ - || return 1 - start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --chuid $USER -- \ - $OPTIONS $DIR $ACTIONS \ - || return 2 + start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ + || return 1 + start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --chuid $USER -- \ + $OPTIONS $DIR $ACTIONS \ + || return 2 } # @@ -72,57 +72,57 @@ do_start() # do_stop() { - # Return - # 0 if daemon has been stopped - # 1 if daemon was already stopped - # 2 if daemon could not be stopped - # other if a failure occurred - start-stop-daemon --stop --quiet --pidfile $PIDFILE - RETVAL="$?" - [ "$RETVAL" = 2 ] && return 2 - rm -f $PIDFILE - return "$RETVAL" + # Return + # 0 if daemon has been stopped + # 1 if daemon was already stopped + # 2 if daemon could not be stopped + # other if a failure occurred + start-stop-daemon --stop --quiet --pidfile $PIDFILE + RETVAL="$?" + [ "$RETVAL" = 2 ] && return 2 + rm -f $PIDFILE + return "$RETVAL" } case "$1" in - start) - [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME" - do_start - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - stop) - [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" - do_stop - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - restart|force-reload) - log_daemon_msg "Restarting $DESC" "$NAME" - do_stop - case "$?" in - 0|1) - do_start - case "$?" in - 0) log_end_msg 0 ;; - 1) log_end_msg 1 ;; # Old process is still running - *) log_end_msg 1 ;; # Failed to start - esac - ;; - *) - # Failed to stop - log_end_msg 1 - ;; - esac - ;; - *) - echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 - exit 3 - ;; + start) + [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME" + do_start + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + stop) + [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" + do_stop + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + restart|force-reload) + log_daemon_msg "Restarting $DESC" "$NAME" + do_stop + case "$?" in + 0|1) + do_start + case "$?" in + 0) log_end_msg 0 ;; + 1) log_end_msg 1 ;; # Old process is still running + *) log_end_msg 1 ;; # Failed to start + esac + ;; + *) + # Failed to stop + log_end_msg 1 + ;; + esac + ;; + *) + echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 + exit 3 + ;; esac : -- cgit v1.2.3 From 63772009a1ef90b4f1173142e4d3b1f5c7c6b332 Mon Sep 17 00:00:00 2001 From: Tails developers Date: Sat, 3 Nov 2012 18:18:45 +0100 Subject: Add a default value for $USER in initscript Relying on the external shell environment can lead to issue hard to understand. We explicitly set USER to root by default, and let admins override it in the default file. --- files/inoticoming.init | 1 + 1 file changed, 1 insertion(+) (limited to 'files/inoticoming.init') diff --git a/files/inoticoming.init b/files/inoticoming.init index e66bb94..bc91568 100755 --- a/files/inoticoming.init +++ b/files/inoticoming.init @@ -21,6 +21,7 @@ NAME=reprepro DAEMON=/usr/bin/inoticoming PIDFILE=/var/run/$NAME.pid SCRIPTNAME=/etc/init.d/$NAME +USER=root # Exit if the package is not installed [ -x "$DAEMON" ] || exit 0 -- cgit v1.2.3 From 8241897c0ccff1bf8d274c3074580e580ad057be Mon Sep 17 00:00:00 2001 From: Tails developers Date: Sat, 3 Nov 2012 18:21:34 +0100 Subject: Add support for status in initscript --- files/inoticoming.init | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'files/inoticoming.init') diff --git a/files/inoticoming.init b/files/inoticoming.init index bc91568..9b658d7 100755 --- a/files/inoticoming.init +++ b/files/inoticoming.init @@ -33,7 +33,8 @@ USER=root . /lib/init/vars.sh # Define LSB log_* functions. -# Depend on lsb-base (>= 3.0-6) to ensure that this file is present. +# Depend on lsb-base (>= 3.2-14) to ensure that this file is present +# and status_of_proc is working. . /lib/lsb/init-functions # @@ -102,6 +103,9 @@ case "$1" in 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; esac ;; + status) + status_of_proc -p "$PIDFILE" "$DAEMON" "$NAME" && exit 0 || exit $? + ;; restart|force-reload) log_daemon_msg "Restarting $DESC" "$NAME" do_stop @@ -121,7 +125,7 @@ case "$1" in esac ;; *) - echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 + echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 exit 3 ;; esac -- cgit v1.2.3