Merge r13787 and r13788 into 0.2.0.x branch.
r13787: Move config check to its own function r13788: Run --verify-config before start/reload/restart as root. svn:r13818
This commit is contained in:
parent
1ff70f2402
commit
977da15690
|
@ -1,3 +1,11 @@
|
||||||
|
tor (0.2.0.20-rc-1+XX) XXperimental; urgency=low
|
||||||
|
|
||||||
|
* Run --verify-config before start/reload/restart as root. No longer
|
||||||
|
su - to debian-tor tor run it. Given that we now even start Tor as
|
||||||
|
root (it setuids later on) this should be fine (closes: #468566).
|
||||||
|
|
||||||
|
-- Peter Palfrader <weasel@debian.org> Sat, 1 Mar 2008 01:49:58 +0100
|
||||||
|
|
||||||
tor (0.2.0.20-rc-1) experimental; urgency=low
|
tor (0.2.0.20-rc-1) experimental; urgency=low
|
||||||
|
|
||||||
* New upstream version.
|
* New upstream version.
|
||||||
|
|
|
@ -89,6 +89,14 @@ check_torpiddir () {
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
check_config () {
|
||||||
|
if ! "$DAEMON --verify-config" > /dev/null; then
|
||||||
|
echo "ABORTED: Tor configuration invalid:" >&2
|
||||||
|
$DAEMON --verify-config >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
case "$1" in
|
case "$1" in
|
||||||
start)
|
start)
|
||||||
|
@ -109,11 +117,7 @@ case "$1" in
|
||||||
check_torpiddir
|
check_torpiddir
|
||||||
|
|
||||||
echo "Starting $DESC: $NAME..."
|
echo "Starting $DESC: $NAME..."
|
||||||
if ! su -s /bin/sh -c "$DAEMON --verify-config" debian-tor > /dev/null; then
|
check_config
|
||||||
echo "ABORTED: Tor configuration invalid:" >&2
|
|
||||||
su -s /bin/sh -c "$DAEMON --verify-config" debian-tor >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
start-stop-daemon --start --quiet --oknodo \
|
start-stop-daemon --start --quiet --oknodo \
|
||||||
--pidfile $TORPID \
|
--pidfile $TORPID \
|
||||||
|
@ -149,11 +153,7 @@ case "$1" in
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! su -s /bin/sh -c "$DAEMON --verify-config" debian-tor > /dev/null; then
|
check_config
|
||||||
echo "ABORTED: Tor configuration invalid:" >&2
|
|
||||||
su -s /bin/sh -c "$DAEMON --verify-config" debian-tor >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if start-stop-daemon --stop --signal 1 --quiet --pidfile $TORPID --exec $DAEMON
|
if start-stop-daemon --stop --signal 1 --quiet --pidfile $TORPID --exec $DAEMON
|
||||||
then
|
then
|
||||||
|
@ -166,11 +166,7 @@ case "$1" in
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
restart)
|
restart)
|
||||||
if ! su -s /bin/sh -c "$DAEMON --verify-config" debian-tor > /dev/null; then
|
check_config
|
||||||
echo "Restarting Tor ABORTED: Tor configuration invalid:" >&2
|
|
||||||
su -s /bin/sh -c "$DAEMON --verify-config" debian-tor >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
$0 stop
|
$0 stop
|
||||||
sleep 1
|
sleep 1
|
||||||
|
|
Loading…
Reference in New Issue