add moving pidfile and initscript support

diff --git a/debian/spamass-milter.default b/debian/spamass-milter.default
index c4cd67cb4b4cd35dfdb733072c11aab784a0dd57..85cfd62daa1331c0fa586cd16408ed06ba4a4192 100644 (file)
--- a/debian/spamass-milter.default
+++ b/debian/spamass-milter.default
@@ -13,6 +13,7 @@ OPTIONS="-u nobody -i 127.0.0.1"
 # Do not modify Subject:, Content-Type: or body.
 #OPTIONS="-m"
 
-# If you are using postfix, you may want to use the following
-# SOCKET="/var/spool/postfix/spamass.sock"
-# RUNAS="postfix"
\ No newline at end of file
+# If you are using postfix, you probably want to uncomment the following
+# SOCKET="/var/spool/postfix/spamass/spamass.sock"
+# RUNAS="postfix"
+# PIDFILE="/var/spool/postfix/spamass/spamass.pid"
\ No newline at end of file

diff --git a/debian/spamass-milter.init b/debian/spamass-milter.init
index a262c2d2283dc820aa4b1d5dbe567e18908529c2..deb05e685b1442224f90c0096fd3c8edc635ebef 100644 (file)
--- a/debian/spamass-milter.init
+++ b/debian/spamass-milter.init
@@ -60,6 +60,15 @@ case "$1" in
 
        if [ ! -d $(dirname $SOCKET) ]; then
            mkdir -p $(dirname $SOCKET);
+           if [ -n "$RUNAS" ]; then
+               chown "$RUNAS" $(dirname $SOCKET);
+           fi;
+       fi;
+       if [ ! -d $(dirname $PIDFILE) ]; then
+           mkdir -p $(dirname $PIDFILE);
+           if [ -n "$RUNAS" ]; then
+               chown "$RUNAS" $(dirname $PIDFILE);
+           fi;
        fi;
        start-stop-daemon --start -p $PIDFILE $CHUID --exec $DAEMON -- -P $PIDFILE -f -p $SOCKET $OPTIONS