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=c4bb5ad6979f1f21c464cd3ff644d0d09dbecae8;hpb=e1ae7678b540e3aa94b2fcf5ab0d8c121d2c80c3;p=mirror%2Fdsa-puppet.git

diff --git a/modules/stunnel4/files/etc-init.d-stunnel4 b/modules/stunnel4/files/etc-init.d-stunnel4
index c4bb5ad69..7bc871ac6 100755
--- a/modules/stunnel4/files/etc-init.d-stunnel4
+++ b/modules/stunnel4/files/etc-init.d-stunnel4
@@ -23,7 +23,9 @@ DESC="SSL tunnels"
 OPTIONS=""
 ENABLED=0
 
-if [ -n "${2-:}" ]; then
+ulimit -n 4096
+
+if [ -n "${2:-}" ]; then
 	if [ -e "/etc/stunnel/$2.conf" ]; then
 		FILES="/etc/stunnel/$2.conf"
 	else
@@ -74,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
 }
@@ -117,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