Fix sysv init so it works (LP: #1839487)
This commit is contained in:
@@ -3,6 +3,7 @@
|
||||
cause a traceback (LP: #1844161)
|
||||
- Catch more ascii encoding errors to improve resilience against bad data
|
||||
(LP: #1844189)
|
||||
- Fix sysv init so it works (LP: #1839487)
|
||||
|
||||
1.1.1 2019-09-06
|
||||
- Fix startup logging so it provides information at a useful time
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
### END INIT INFO
|
||||
prefix="/usr/local"
|
||||
exec_prefix=${prefix}
|
||||
sysconfdir="/etc/dkimpy-milter"
|
||||
sysconfdir="/usr/local/etc"
|
||||
bindir="${exec_prefix}/bin/"
|
||||
RUNDIR="/run/dkimpy-milter"
|
||||
DAEMON=${bindir}/dkimpy-milter
|
||||
@@ -67,14 +67,14 @@ case "$1" in
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
start-stop-daemon --start --quiet --pidfile $RUNDIR/$NAME.pid --startas \
|
||||
$DAEMON $sysconfdir/$NAME.conf --name $NAME --test > /dev/null \
|
||||
start-stop-daemon --start --background --quiet --pidfile \
|
||||
$RUNDIR/$NAME.pid --exec $DAEMON $sysconfdir/$NAME.conf
|
||||
echo "$NAME."
|
||||
;;
|
||||
stop)
|
||||
echo -n "Stopping $DESC: "
|
||||
if [ -f $RUNDIR/$NAME.pid ]; then
|
||||
chown root:root $RUNDIR/$NAME.pid
|
||||
start-stop-daemon --stop --pidfile $RUNDIR/$NAME.pid
|
||||
rm $RUNDIR/$NAME.pid
|
||||
#echo $SOCKET
|
||||
@@ -87,6 +87,7 @@ case "$1" in
|
||||
force-reload)
|
||||
echo -n "Force reloading $DESC: "
|
||||
if [ -f $RUNDIR/$NAME.pid ]; then
|
||||
chown root:root $RUNDIR/$NAME.pid
|
||||
start-stop-daemon --stop --pidfile $RUNDIR/$NAME.pid
|
||||
rm $RUNDIR/$NAME.pid
|
||||
#echo $SOCKET
|
||||
@@ -95,7 +96,7 @@ case "$1" in
|
||||
fi
|
||||
fi
|
||||
sleep 1
|
||||
start-stop-daemon --start --chuid $USER --background --quiet --pidfile \
|
||||
start-stop-daemon --start --background --quiet --pidfile \
|
||||
$RUNDIR/$NAME.pid --exec $DAEMON $sysconfdir/$NAME.conf
|
||||
echo "$NAME."
|
||||
;;
|
||||
@@ -103,6 +104,7 @@ case "$1" in
|
||||
echo "Restarting $DESC: "
|
||||
echo -n "Stopping $DESC: "
|
||||
if [ -f $RUNDIR/$NAME.pid ]; then
|
||||
chown root:root $RUNDIR/$NAME.pid
|
||||
start-stop-daemon --stop --pidfile $RUNDIR/$NAME.pid
|
||||
rm $RUNDIR/$NAME.pid
|
||||
#echo $SOCKET
|
||||
@@ -113,7 +115,7 @@ case "$1" in
|
||||
echo "$NAME."
|
||||
sleep 1
|
||||
echo -n "Starting $DESC: "
|
||||
start-stop-daemon --start --chuid $USER --background --quiet --pidfile \
|
||||
start-stop-daemon --start --background --quiet --pidfile \
|
||||
$RUNDIR/$NAME.pid --exec $DAEMON $sysconfdir/$NAME.conf
|
||||
echo "$NAME."
|
||||
;;
|
||||
|
||||
Reference in New Issue
Block a user