SOCKETMODE options accordingly (closes: #391789) Thanks to Zach

  Sadecki and Marco d'Itri for testing this fix.

diff --git a/debian/changelog b/debian/changelog
index 0629ec2ee596b53710b49143b17753c878a810ee..8b398dca0db6c2feac95641788cd1a7b37385026 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,10 +3,10 @@ spamass-milter (0.3.1-3) unstable; urgency=low
   * Use dirname instead of basename (closes: #391909)
   * Add RUNAS option to change the user that spamass-milter runs as.
   * Automatically detect postfix installs, and change the PID, SOCKET, and
-    RUNAS options accordingly (closes: #391789) Thanks to Zach Sadecki for
-    testing this fix.
+    SOCKETMODE options accordingly (closes: #391789) Thanks to Zach
+    Sadecki and Marco d'Itri for testing this fix.
 
- -- Don Armstrong <don@debian.org>  Fri, 13 Oct 2006 16:57:27 -0700
+ -- Don Armstrong <don@debian.org>  Mon,  1 Jan 2007 11:07:17 -0800
 
 spamass-milter (0.3.1-2) unstable; urgency=low
 

diff --git a/debian/spamass-milter.default b/debian/spamass-milter.default
index 972cacd2ff635a67cdae0adebb4e37ccce9ef9bf..bc971fa452ade67b7f57b08822b576b2b5c0eb5c 100644 (file)
--- a/debian/spamass-milter.default
+++ b/debian/spamass-milter.default
@@ -19,6 +19,6 @@ OPTIONS="-u nobody -i 127.0.0.1"
 # here.
 ######################################
 # SOCKET="/var/spool/postfix/spamass/spamass.sock"
-# RUNAS="postfix:postfix"
 # PIDFILE="/var/spool/postfix/spamass/spamass.pid"
+# SOCKETMODE="0666"
 ######################################
\ No newline at end of file

diff --git a/debian/spamass-milter.init b/debian/spamass-milter.init
index 6ef3e75c941793ea5b44068c61d53cc5abdcaf19..79b38b1643fc682653e12227f630823e6086a784 100644 (file)
--- a/debian/spamass-milter.init
+++ b/debian/spamass-milter.init
@@ -41,6 +41,7 @@ DEFAULT=/etc/default/spamass-milter
 OPTIONS=""
 RUNAS=""
 CHUID=""
+SOCKETMODE=""
 
 test -x $DAEMON || exit 0
 
@@ -48,8 +49,9 @@ test -x $DAEMON || exit 0
 # These can be overridden in /etc/default/spamass-milter
 if [ -x /usr/sbin/postfix ]; then
     SOCKET="/var/spool/postfix/spamass/spamass.sock"
-    RUNAS="postfix:postfix"
+    RUNAS=""
     PIDFILE="/var/spool/postfix/spamass/spamass.pid"
+    SOCKETMODE="0666"
 fi;
 
 if [ -r $DEFAULT ]; then
@@ -78,7 +80,11 @@ case "$1" in
                chown "$RUNAS" $(dirname $PIDFILE);
            fi;
        fi;
+       /bin/rm -f $SOCKET
        start-stop-daemon --start -p $PIDFILE $CHUID --exec $DAEMON -- -P $PIDFILE -f -p $SOCKET $OPTIONS
+       if [ -n "$SOCKETMODE" ]; then
+           chmod $SOCKETMODE $SOCKET;
+       fi;
 
        echo "${DAEMON}"
        ;;
@@ -99,6 +105,10 @@ case "$1" in
        /bin/rm -f $SOCKET
         start-stop-daemon --start -p $PIDFILE $CHUID --exec $DAEMON -- -P $PIDFILE -f -p $SOCKET $OPTIONS
 
+       if [ -n "$SOCKETMODE" ]; then
+           chmod $SOCKETMODE $SOCKET;
+       fi;
+
         echo "${DAEMON}"
 
        ;;