RedXen
/
ansible-postfix
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add rspamd and fix smtp

This commit is contained in:
Alex 2020-08-11 08:27:12 +02:00
parent 104494b709
commit ea3f0d1d2b
Signed by: caskd
GPG Key ID: F92BA85F61F4C173
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
templates/main.cf.j2
View File

@ -37,11 +37,12 @@ smtpd_sasl_auth_enable = yes
smtpd_sasl_type = dovecot
smtpd_sasl_path = private/auth
# OpenDKIM
# OpenDKIM & RSpamD
milter_default_action = accept
milter_protocol = 6
smtpd_milters = local:opendkim/opendkim.sock
non_smtpd_milters = local:opendkim/opendkim.sock
smtpd_milters = local:opendkim/opendkim.sock inet:127.0.0.1:11332
non_smtpd_milters = local:opendkim/opendkim.sock inet:127.0.0.1:11332
milter_mail_macros="i {mail_addr} {client_addr} {client_name} {auth_authen}"
home_mailbox = Mail/Inbox/

5
templates/master.cf.j2
View File

@ -9,12 +9,10 @@
# service type private unpriv chroot wakeup maxproc command + args
# (yes) (yes) (no) (never) (100)
# ==========================================================================
smtp inet n - y - - smtpd
#smtp inet n - y - 1 postscreen
#smtpd pass - - y - - smtpd
#dnsblog unix - - y - 0 dnsblog
#tlsproxy unix - - y - 0 tlsproxy
smtp unix - - n - - smtp
submission inet n - y - - smtpd
-o smtpd_tls_security_level=encrypt
-o smtpd_sasl_auth_enable=yes
@ -24,6 +22,7 @@ submission inet n - y - - smtpd
-o smtpd_sasl_local_domain=$myhostname
-o smtpd_client_restrictions=permit_sasl_authenticated,reject
-o smtpd_recipient_restrictions=reject_non_fqdn_recipient,reject_unknown_recipient_domain,permit_sasl_authenticated,reject
smtp inet n - n - - smtpd
smtps inet n - y - - smtpd
-o syslog_name=postfix/smtps
-o smtpd_tls_wrappermode=yes
@ -34,7 +33,6 @@ smtps inet n - y - - smtpd
# -o smtpd_sender_restrictions=$mua_sender_restrictions
# -o smtpd_recipient_restrictions=
# -o smtpd_relay_restrictions=permit_sasl_authenticated,reject
#rspamd unix - n n - - pipe #TODO
#628 inet n - y - - qmqpd
pickup unix n - y 60 1 pickup
cleanup unix n - y - 0 cleanup
@ -49,7 +47,6 @@ verify unix - - y - 1 verify
flush unix n - y 1000? 0 flush
proxymap unix - - n - - proxymap
proxywrite unix - - n - 1 proxymap
smtp unix - - y - - smtp
relay unix - - y - - smtp
-o syslog_name=postfix/$service_name
# -o smtp_helo_timeout=5 -o smtp_connect_timeout=5