Switch default MTA from sendmail to dma
authorJohn Marino <draco@marino.st>
Sat, 7 Mar 2015 19:08:26 +0000 (20:08 +0100)
committerJohn Marino <draco@marino.st>
Sat, 7 Mar 2015 21:06:38 +0000 (22:06 +0100)
The mailwrapper controls which Mail Transfer Agent is used.  The
mailer.conf defines the behavior of the mailwrapper.  This commit will
have no effect on existing installations, but for the first installation
a new mailer.conf will be installed during the "distribution" target.

This means all new images have the DragonFly Mail Agent acting as base
MTA rather than Sendmail for the first time in the project's history.

While here, set the default path in the mail wrapper to dma as well,
although this isn't used unless the mailer.conf is incomplete.

etc/mail/mailer.conf
usr.sbin/mailwrapper/pathnames.h

index e7eef9b..fc88c7f 100644 (file)
@@ -1,11 +1,32 @@
-# $FreeBSD: src/etc/mail/mailer.conf,v 1.2.2.1 2002/04/09 02:00:56 gshapiro Exp $
-# $DragonFly: src/etc/mail/mailer.conf,v 1.2 2003/06/17 04:24:47 dillon Exp $
 #
-# Execute the "real" sendmail program, named /usr/libexec/sendmail/sendmail
+# Set the Mail Transfer Agent for DragonFly
 #
-sendmail       /usr/libexec/sendmail/sendmail
-send-mail      /usr/libexec/sendmail/sendmail
-mailq          /usr/libexec/sendmail/sendmail
-newaliases     /usr/libexec/sendmail/sendmail
-hoststat       /usr/libexec/sendmail/sendmail
-purgestat      /usr/libexec/sendmail/sendmail
+
+
+sendmail       /usr/libexec/dma
+mailq          /usr/libexec/dma
+newaliases     true
+hoststat       true
+purgestat      true
+
+
+# Replace with following if mail/sendmail from DPorts is desired
+# sendmail     /usr/local/sbin/sendmail
+# mailq                /usr/local/bin/mailq
+# newaliases   /usr/local/bin/newaliases
+# hoststat     /usr/local/bin/hoststat
+# purgestat    /usr/local/bin/purgestat
+
+# Replace with following if mail/postfix from DPorts is desired
+# sendmail     /usr/local/sbin/sendmail
+# mailq                /usr/local/bin/mailq
+# newaliases   /usr/local/bin/newaliases
+# hoststat     true
+# purgestat    true
+
+# Replace with following if mail/opensmtpd from DPorts is desired
+# sendmail     /usr/local/sbin/smtpctl
+# mailq                /usr/local/sbin/smtpctl
+# newaliases   /usr/local/sbin/smtpctl
+# hoststat     true
+# purgestat    true
index 71d8ab3..8bdc97e 100644 (file)
@@ -1,5 +1,4 @@
 /* $FreeBSD: src/usr.sbin/mailwrapper/pathnames.h,v 1.3 2000/01/10 03:20:13 imp Exp $ */
-/* $DragonFly: src/usr.sbin/mailwrapper/pathnames.h,v 1.2 2003/06/17 04:29:57 dillon Exp $ */
 
 /*
  * Copyright (c) 1998
@@ -33,4 +32,4 @@
  */
 
 #define _PATH_MAILERCONF       "/etc/mail/mailer.conf"
-#define _PATH_DEFAULTMTA       "/usr/libexec/sendmail/sendmail"
+#define _PATH_DEFAULTMTA       "/usr/libexec/dma"