From: John Marino <draco@marino.st>
Date: Sat, 7 Mar 2015 19:08:26 +0000 (+0100)
Subject: Switch default MTA from sendmail to dma
X-Git-Tag: v4.2.0rc~659
X-Git-Url: https://gitweb.dragonflybsd.org/~tuxillo/dragonfly.git/commitdiff_plain/128d54586a9664bc8392d7c79dfdb8c78e0a43d7

Switch default MTA from sendmail to dma

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.
---

diff --git a/etc/mail/mailer.conf b/etc/mail/mailer.conf
index e7eef9bf80..fc88c7f756 100644
--- a/etc/mail/mailer.conf
+++ b/etc/mail/mailer.conf
@@ -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
diff --git a/usr.sbin/mailwrapper/pathnames.h b/usr.sbin/mailwrapper/pathnames.h
index 71d8ab3227..8bdc97e006 100644
--- a/usr.sbin/mailwrapper/pathnames.h
+++ b/usr.sbin/mailwrapper/pathnames.h
@@ -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"