Package: spamass-milter
Version: 0.3.1-2
Severity: wishlist
Tags: patch
Thoses patch improve /etc/default/spamass-milter to allow to choose an
alternative socket and to choose an user to run as.
/etc/init.d/spamass-milter is also improved to create a /var/run/spamass
subdirectory and to launch spamass-milter as specified user.
-- System Information:
Debian Release: 4.0
APT prefers stable
APT policy: (990, 'stable'), (100, 'oldstable')
Architecture: i386 (i686)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.22.13.skc7
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
--- spamass-milter.default.orig 2008-04-16 12:46:02.000000000 +0200
+++ spamass-milter.default 2008-04-16 12:49:25.000000000 +0200
@@ -12,3 +12,10 @@
# Do not modify Subject:, Content-Type: or body.
#OPTIONS="-m"
+
+# If you want to set an alternate socket, do so here (remember to change
+# sendmail.mc for Sendmail and main.cf for Postfix):
+#SOCKET="/var/run/sendmail/spamass.sock"
+
+# User spamass-milter run as (default to root)
+#RUNAS=spamd
--- spamass-milter.init.orig 2008-04-16 12:46:06.000000000 +0200
+++ spamass-milter.init 2008-04-21 18:16:11.000000000 +0200
@@ -34,11 +34,12 @@
PATH=/sbin:/bin:/usr/sbin:/usr/bin
DAEMON=/usr/sbin/spamass-milter
SOCKET=/var/run/sendmail/spamass.sock
-PIDFILE=/var/run/spamass.pid
+PIDFILE=/var/run/spamass/spamass.pid
DESC="Sendmail milter plugin for SpamAssassin"
DEFAULT=/etc/default/spamass-milter
OPTIONS=""
+RUNAS=root
test -x $DAEMON || exit 0
@@ -46,6 +47,16 @@
. $DEFAULT;
fi;
+# Fix owner on /var/run/spamass/
+PIDDIR=$(dirname $PIDFILE)
+if [ $PIDDIR = "/var/run/spamass" ]; then
+ if [ ! -d $PIDDIR ]; then
+ mkdir $PIDDIR
+ fi
+ chown -h $RUNAS $PIDDIR
+fi
+
+# Exit on error
set -e
case "$1" in
@@ -55,7 +66,7 @@
if [ ! -d $(basename $SOCKET) ]; then
mkdir -p $(basename $SOCKET);
fi;
- start-stop-daemon --start -p $PIDFILE --exec $DAEMON -- -P $PIDFILE -f
-p $SOCKET $OPTIONS
+ start-stop-daemon --start --chuid $RUNAS -p $PIDFILE --exec $DAEMON --
-P $PIDFILE -f -p $SOCKET $OPTIONS
echo "${DAEMON}"
;;
@@ -74,7 +85,7 @@
start-stop-daemon --stop -p $PIDFILE --signal 3 --exec $DAEMON
/bin/sleep 5s
/bin/rm -f $SOCKET
- start-stop-daemon --start -p $PIDFILE --exec $DAEMON -- -P $PIDFILE -f
-p $SOCKET $OPTIONS
+ start-stop-daemon --start --chuid $RUNAS -p $PIDFILE --exec $DAEMON --
-P $PIDFILE -f -p $SOCKET $OPTIONS
echo "${DAEMON}"
