projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use start-stop-daemon for stopping/restarting stunnel4
[mirror/dsa-puppet.git]
/
modules
/
stunnel4
/
files
/
etc-init.d-stunnel4
diff --git
a/modules/stunnel4/files/etc-init.d-stunnel4
b/modules/stunnel4/files/etc-init.d-stunnel4
index
fc17c6d
..
7bc871a
100755
(executable)
--- a/
modules/stunnel4/files/etc-init.d-stunnel4
+++ b/
modules/stunnel4/files/etc-init.d-stunnel4
@@
-20,10
+20,22
@@
DEFAULTPIDFILE="/var/run/stunnel4.pid"
DAEMON=/usr/bin/stunnel4
NAME=stunnel
DESC="SSL tunnels"
DAEMON=/usr/bin/stunnel4
NAME=stunnel
DESC="SSL tunnels"
-FILES="${STUNNEL_FILES:-/etc/stunnel/*.conf}"
OPTIONS=""
ENABLED=0
OPTIONS=""
ENABLED=0
+ulimit -n 4096
+
+if [ -n "${2:-}" ]; then
+ if [ -e "/etc/stunnel/$2.conf" ]; then
+ FILES="/etc/stunnel/$2.conf"
+ else
+ echo >&2 "/etc/stunnel/$2.conf does not exist."
+ exit 1
+ fi
+else
+ FILES="/etc/stunnel/*.conf"
+fi
+
get_pids() {
local file=$1
if test -f $file; then
get_pids() {
local file=$1
if test -f $file; then
@@
-64,9
+76,9
@@
killdaemons()
{
for file in $FILES; do
PROCLIST=`get_pids $file`
{
for file in $FILES; do
PROCLIST=`get_pids $file`
- if [ "$PROCLIST" ] && kill -0 $PROCLIST 2>/dev/null; then
- kill $PROCLIST
-
echo -n "[stopped: $file] "
+ for p in $PROCLIST; do
+ start-stop-daemon --stop --retry 30 --pid "$p"
+ echo -n "[stopped: $file] "
fi
done
}
fi
done
}
@@
-107,7
+119,7
@@
case "$1" in
;;
*)
N=/etc/init.d/$NAME
;;
*)
N=/etc/init.d/$NAME
- echo "Usage: $N {start|stop|force-reload|restart}" >&2
+ echo "Usage: $N {start|stop|force-reload|restart}
[<stunnel instance>]
" >&2
exit 1
;;
esac
exit 1
;;
esac