summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--usr.sbin/smtpd/smtpd.conf.524
1 files changed, 10 insertions, 14 deletions
diff --git a/usr.sbin/smtpd/smtpd.conf.5 b/usr.sbin/smtpd/smtpd.conf.5
index b431fb5f049..53c78d11592 100644
--- a/usr.sbin/smtpd/smtpd.conf.5
+++ b/usr.sbin/smtpd/smtpd.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: smtpd.conf.5,v 1.242 2019/12/14 16:24:52 gilles Exp $
+.\" $OpenBSD: smtpd.conf.5,v 1.243 2019/12/17 10:28:31 jmc Exp $
.\"
.\" Copyright (c) 2008 Janne Johansson <jj@openbsd.org>
.\" Copyright (c) 2009 Jacek Masiulaniec <jacekm@dobremiasto.net>
@@ -17,7 +17,7 @@
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
.\"
-.Dd $Mdocdate: December 14 2019 $
+.Dd $Mdocdate: December 17 2019 $
.Dt SMTPD.CONF 5
.Os
.Sh NAME
@@ -1178,20 +1178,16 @@ Alternatively, the
.Sy opensmtpd-filter-rspamd
package may be used to provide integration with
.Sy rspamd ,
-a third-party daemon also providing DKIM and multiple other antispam features.
+a third-party daemon which provides multiple antispam features
+as well as DKIM signing.
+As well as configuring
+.Sy rspamd
+itself,
+it requires use of the
+.Cm proc-exec
+keyword:
.Bd -literal -offset indent
-table aliases file:/etc/mail/aliases
-
filter "rspamd" proc-exec "filter-rspamd"
-
-listen on socket filter "rspamd"
-listen on lo0 filter "rspamd"
-
-action "local_mail" mbox alias <aliases>
-action "outbound" relay
-
-match for local action "local_mail"
-match for any action "relay_dkim"
.Ed
.Pp
Sites that accept non-local messages may be able to cut down on the