[minion-cvs] Add option to pipe outgoing mail through a command inst...

[nickm@seul.org (Nick Mathewson)]

Update of /home/minion/cvsroot/src/minion/etc
In directory moria.mit.edu:/tmp/cvs-serv10931/etc

Modified Files:
	mixminiond.conf mixminiond.conf.5 
Log Message:
Add option to pipe outgoing mail through a command instead of using SMTP

Index: mixminiond.conf
===================================================================
RCS file: /home/minion/cvsroot/src/minion/etc/mixminiond.conf,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- mixminiond.conf	23 Mar 2004 00:06:12 -0000	1.47
+++ mixminiond.conf	19 Apr 2004 03:47:16 -0000	1.48
@@ -297,6 +297,7 @@
 #AddressFile: <path to address file>
 #ReturnAddress: <"From:" address to use>
 #RemoveContact: <Address to use as a contact>
+#SendmailCommand: sendmail -i -t
 #SMTPServer: localhost
 #Retry: every 7 hours for 6 days
 #  Note that 'MaximumSize' is calculated for uncompressed messages, before
@@ -317,6 +318,13 @@
 #
 #[Delivery/SMTP]
 #Enabled: yes
+#
+#   You must specify _one_ of these next two options.  SendmailCommand _must_
+#   read an RFC822 message and take its To: and From: lines from the message
+#   headers.  It must interpret EOF as message end, not '.'.  SMTPServer can
+#   be the hostname of any SMTP server.
+#
+#SendmailCommand: sendmail -i -t
 #SMTPServer: localhost
 #
 #   Default subject line to use when the user doesn't supply one.

Index: mixminiond.conf.5
===================================================================
RCS file: /home/minion/cvsroot/src/minion/etc/mixminiond.conf.5,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mixminiond.conf.5	4 Apr 2004 21:26:54 -0000	1.2
+++ mixminiond.conf.5	19 Apr 2004 03:47:16 -0000	1.3
@@ -297,6 +297,12 @@
 .It Cm Retry
 RetrySchedule: How often, and for how long, should the server attempt to
 send failed SMTP messages?  Defaults to "every 7 hours for 6 days".
+.It Cm SendmailCommand
+A command (possibly with options) to use for delivering outgoing messages.
+When invoked, the command must accept an RFC822-encoded message from
+standard input, terminated by an end of file.  It must learn the destination
+and origin addresses from the message headers.  (If using sendmail, remember
+to give the command as "sendmail -i -t".)
 .It Cm SMTPServer
 Hostname of the SMTP server that should be used to deliver outgoing
 messages.  Defaults to "localhost".
@@ -357,8 +363,8 @@
 All other lines must be of the format "mboxname: emailaddress@example.com".
 .It Cm RemoveContact
 A contact address that users can email to be removed from the address file.
-.It Cm Retry, SMTPServer, MaximumSize, AllowFromAddress, X-Abuse, \
-Comments, Message, FromTag, ReturnAddress
+.It Cm Retry, SendmailCommand, SMTPServer, MaximumSize, AllowFromAddress, \
+X-Abuse, Comments, Message, FromTag, ReturnAddress
 See the corresponding entries in the [Delivery/SMTP] section.
 .El
 .Ss The [Delivery/SMTP-Via-Mixmaster] Section