X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fstunnel4%2Ffiles%2Fetc-init.d-stunnel4;h=7bc871ac6686cd6edb3e4d15b37e74fb0c0aa400;hb=b73d2475a76c6b59dde700416f1fed8d29cab562;hp=2ffa2533489bf2ddd971bacbd456420a9e531658;hpb=4fc01525dbe32a31bdc061e72058f6c18d88ad4e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/stunnel4/files/etc-init.d-stunnel4 b/modules/stunnel4/files/etc-init.d-stunnel4
index 2ffa25334..7bc871ac6 100755
--- 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"
-FILES="/etc/stunnel/*.conf"
 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
@@ -64,9 +76,9 @@ killdaemons()
 {
   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
 }
@@ -107,7 +119,7 @@ case "$1" in
         ;;
   *)
         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