X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=debian%2FREADME.Debian;h=4c40aee53c0e782c96beeee068970cc4607a60e5;hb=b2e4b7efa05532e6b55579fb44d0c378b447af44;hp=309eb50a193039854572379acfabc15bc8c594cb;hpb=4d4e8dafb5646d8781dbf5fcdf695e8ca92227d1;p=deb_pkgs%2Fspamass-milter.git

diff --git a/debian/README.Debian b/debian/README.Debian
index 309eb50..4c40aee 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -6,13 +6,16 @@ You will need to edit /etc/mail/sendmail.mc and add an
 INPUT_MAIL_FILTER line that connects to the spamass-milter socket.
 
 By default the spamass-milter socket is
-/var/run/sendmail/spamass.sock; so your INPUT_MAIL_FILTER should look
+/var/run/spamass/spamass.sock; so your INPUT_MAIL_FILTER should look
 something like:
 
  # spamassassin settings
  INPUT_MAIL_FILTER(`spamassassin',
-         `S=local:/var/run/sendmail/spamass.sock, F=,
+         `S=local:/var/run/spamass/spamass.sock, F=,
          T=S:4m;R:4m;E:10m')dnl
+ define(`confMILTER_MACROS_CONNECT',`t, b, j, _, {daemon_name}, {if_name}, {if_addr}')dnl
+ define(`confMILTER_MACROS_HELO',`s, {tls_version}, {cipher}, {cipher_bits}, {cert_subject}, {cert_issuer}')dnl
+ define(`confMILTER_MACROS_ENVRCPT',`b, i, j, r, v, Z, _')dnl
 
 Briefly, the F=, tells sendmail to just pass the connection through if
 the milter fails. This is most likely the setting you want. If you
@@ -42,20 +45,49 @@ You need to edit /etc/postfix/main.cf and configure smptpd_milters so
 that postfix connects to the spamass-milter socket. Something like:
 
   # spamass-milter configuration
-  smtpd_milters = unix:/var/run/sendmail/spamass.sock
+  smtpd_milters = unix:/var/spool/postfix/spamass/spamass.sock
 
-should work. See http://www.postfix.org/MILTER_README.html or
+should work. Note, however, if you're using a chrooted version of
+postfix, you'll need the local path to the socket inside of the
+chroot. In recent versions of Debian the following should work:
+
+  # spamass-milter configuration
+  smtpd_milters = unix:/spamass/spamass.sock
+  # milter macros usefull for spamass-milter
+  milter_connect_macros = j {daemon_name} v {if_name} _
+
+See http://www.postfix.org/MILTER_README.html or
 /usr/share/doc/postfix/MILTER_README.gz (in postfix-doc) for
 information on how to set tempfail and the various timeouts that the
 sendmail configuration above uses.
 
+The defaults for spamass-milter adjust themselves so that no
+configuration in /etc/default/spamass-milter should be required.
+[However, if you are not doing so, see below.]
+
 -------------------------------------------------------------
   Adjusting how spamass-milter is started
 -------------------------------------------------------------
 
 You can adjust how spamass-milter starts, and the options it calls
 spamc with by adjusting /etc/default/spamass-milter. OPTIONS is passed
-directly to spamass-milter by /etc/init.d/spamass-milter.
+directly to spamass-milter by /etc/init.d/spamass-milter. [Refer to
+spamass-milter(1) for details.]
+
+Other settings which may be of use:
+
+SOCKET sets the location of the socket; defaults to
+/var/run/spamass/spamass.sock unless you are running postfix, where it
+is set to /var/spool/postfix/spamass/spamass.sock.
+
+SOCKETOWNER is the owner of the socket, which defaults to root:root or
+postfix:postfix if you're running postfix.
+
+SOCKETMODE is the mode of the socket, which defaults to 0600 or 0660
+if you're running postfix.
+
+RUNAS controls the user which spamass-milter runs as; defaults to
+spamass-milter.
 
 -------------------------------------------------------------
 Debugging spamass-milter
@@ -86,4 +118,4 @@ q
 
 and send the results along with your bug report using reportbug.
 
- -- Don Armstrong <don@donarmstrong.com>, Tuesday, September 12, 2006 20:24:40 PDT
+ -- Don Armstrong <don@debian.org>, Mon,  5 Jan 2009 13:03:36 -0800