Variable expansion related cleanup for man pages and sysv init
This commit is contained in:
@@ -33,8 +33,8 @@ test -x $DAEMON || exit 0
|
||||
|
||||
# Include dkimpy-python defaults if available
|
||||
# Typically not used
|
||||
if [ -f @SYSCONFDIR@/default/dkimpy-milter ] ; then
|
||||
. @SYSCONFDIR@/default/dkimpy-milter
|
||||
if [ -f $sysconfdir/default/dkimpy-milter ] ; then
|
||||
. $sysconfdir/default/dkimpy-milter
|
||||
fi
|
||||
|
||||
set -e
|
||||
@@ -65,14 +65,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
|
||||
@@ -85,6 +85,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
|
||||
@@ -93,7 +94,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."
|
||||
;;
|
||||
@@ -101,6 +102,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
|
||||
@@ -111,7 +113,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