auto detect postfix installs

diff --git a/debian/spamass-milter.default b/debian/spamass-milter.default
index 85cfd62daa1331c0fa586cd16408ed06ba4a4192..972cacd2ff635a67cdae0adebb4e37ccce9ef9bf 100644 (file)
--- a/debian/spamass-milter.default
+++ b/debian/spamass-milter.default
@@ -13,7 +13,12 @@ OPTIONS="-u nobody -i 127.0.0.1"
 # Do not modify Subject:, Content-Type: or body.
 #OPTIONS="-m"
 
-# If you are using postfix, you probably want to uncomment the following
+######################################
+# If /usr/sbin/postfix is executable, the following are set by
+# default. You can override them by uncommenting and changing them
+# here.
+######################################
 # SOCKET="/var/spool/postfix/spamass/spamass.sock"
-# RUNAS="postfix"
-# PIDFILE="/var/spool/postfix/spamass/spamass.pid"
\ No newline at end of file
+# RUNAS="postfix: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 deb05e685b1442224f90c0096fd3c8edc635ebef..5396f649e208fa3a2871d7c937369ed5d1dd10ab 100644 (file)
--- a/debian/spamass-milter.init
+++ b/debian/spamass-milter.init
@@ -44,6 +44,14 @@ CHUID=""
 
 test -x $DAEMON || exit 0
 
+# If /usr/sbin/postfix exists, set up the defaults for a postfix install
+# These can be overridden in /etc/default/spamass-milter
+if [ -x /usr/sbin/posfix ]; then
+    SOCKET="/var/spool/postfix/spamass/spamass.sock"
+    RUNAS="postfix:postfix"
+    PIDFILE="/var/spool/postfix/spamass/spamass.pid"
+fi;
+
 if [ -r $DEFAULT ]; then
     . $DEFAULT;
 fi;