Merge branch 'upstream'

[deb_pkgs/spamass-milter.git] / debian / spamass-milter.default

diff --git a/debian/spamass-milter.default b/debian/spamass-milter.default
index c4cd67cb4b4cd35dfdb733072c11aab784a0dd57..8922fb582b9d2738e2907ffdaadaa0cb558cc6e1 100644 (file)
--- a/debian/spamass-milter.default
+++ b/debian/spamass-milter.default
@@ -3,16 +3,26 @@
 # OPTIONS are passed directly to spamass-milter.
 # man spamass-milter for details
 
-# Default, use the nobody user as the default user, ignore messages
-# from localhost
-OPTIONS="-u nobody -i 127.0.0.1"
+# Non-standard configuration notes:
+# See README.Debian if you use the -x option with sendmail
+# You should not pass the -d option in OPTIONS; use SOCKET for that.
+
+# Default, use the spamass-milter user as the default user, ignore
+# messages from localhost
+OPTIONS="-u spamass-milter -i 127.0.0.1"
 
 # Reject emails with spamassassin scores > 15.
-#OPTIONS="-r 15"
+#OPTIONS="${OPTIONS} -r 15"
 
 # Do not modify Subject:, Content-Type: or body.
-#OPTIONS="-m"
+#OPTIONS="${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 /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"
+# SOCKETOWNER="postfix:postfix"
+# SOCKETMODE="0660"
+######################################