diff --git a/CHANGES b/CHANGES index 44ea9c2..f55b23f 100644 --- a/CHANGES +++ b/CHANGES @@ -6,6 +6,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.0.1 2019-02-11 * Reorder milter start and dropping privileges so permissions on Unix socket diff --git a/system/dkimpy-milter b/system/dkimpy-milter index d247247..f4d4e0f 100755 --- a/system/dkimpy-milter +++ b/system/dkimpy-milter @@ -20,9 +20,9 @@ ### END INIT INFO prefix="/usr/local" exec_prefix=${prefix} -sysconfdir="/etc/dkimpy-milter" +sysconfdir="/usr/local/etc" bindir="${exec_prefix}/bin/" -RUNDIR="/var/run/dkimpy-milter" +RUNDIR="/run/dkimpy-milter" DAEMON=${bindir}/dkimpy-milter PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin: NAME=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." ;;