From 3cf4f620ea96162e989f883ba65cf09bed29fcb0 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Wed, 5 May 2010 21:53:12 +0200
Subject: improve stunnel init.d script

---
 files/CentOS/stunnel.init | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'files')

diff --git a/files/CentOS/stunnel.init b/files/CentOS/stunnel.init
index 023568b..d5c60fd 100644
--- a/files/CentOS/stunnel.init
+++ b/files/CentOS/stunnel.init
@@ -54,11 +54,15 @@ if [ ! -f $CONF ] ; then
 exit 0
 fi
 
+CHROOT=`grep '^chroot' /etc/stunnel/stunnel.conf | head -n 1 | sed 's/ //g' | awk -F= '{ print $2 }'`
+PIDFILE=`grep '^pid' /etc/stunnel/stunnel.conf | head -n 1 | sed 's/ //g' | awk -F= '{ print $2 }'` 
+if [ -n "$CHROOT" ]; then
+    PIDFILE=$CHROOT/$PIDFILE
+fi
+
 # Path to the lock file.
 #
 LOCK_FILE=/var/lock/subsys/stunnel
-# pidfile to be used
-pidfile=/var/run/stunnel/stunnel.pid
 
 #====================================================================
 
@@ -98,7 +102,7 @@ stop() {
   else
 
     echo -n $"Shutting down $prog: "
-    killproc stunnel
+    killproc -p $PIDFILE stunnel
     RETVAL=$?
     [ $RETVAL -eq 0 ]
      rm -f $LOCK_FILE
@@ -128,7 +132,7 @@ case "$1" in
   fi
   ;;
    status)
-  status -p $pidfile stunnel
+  status -p $PIDFILE stunnel
   RETVAL=$?
   ;;
    *)
-- 
cgit v1.2.3