mirror of
https://github.com/docker-mailserver/docker-mailserver.git
synced 2024-01-19 02:48:50 +00:00
chore(Amavis): only add configuration to Postfix when enabled (#3046)
* only add Amavis configuration to Postfix when enabled Since I am running Rspamd nowadays, I noticed there still are ports open that belong to Amavis. This is because the Amavis configuration is a fixed part of Postfix's `master.cf`. I changed that. Now, the Amavis section is added when Amavis really is enabled. I took the chance and added proper indentation to `master.cf`; hence the diff is a bit fuzzy. **But**, only the Amavis part was adjusted, the rest is just styling.
This commit is contained in:
Georg Lauterbach
GitHub
parent
7a61214aa5
commit
774a340d76
|
|
@ -112,6 +112,7 @@ RUN <<EOF
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
COPY target/amavis/conf.d/* /etc/amavis/conf.d/
|
COPY target/amavis/conf.d/* /etc/amavis/conf.d/
|
||||||
|
COPY target/amavis/postfix-amavis.cf /etc/dms/postfix/master.d/
|
||||||
RUN <<EOF
|
RUN <<EOF
|
||||||
sedfile -i -r 's/#(@| \\%)bypass/\1bypass/g' /etc/amavis/conf.d/15-content_filter_mode
|
sedfile -i -r 's/#(@| \\%)bypass/\1bypass/g' /etc/amavis/conf.d/15-content_filter_mode
|
||||||
# add users clamav and amavis to each others group
|
# add users clamav and amavis to each others group
|
||||||
|
|
|
||||||
35
target/amavis/postfix-amavis.cf
Normal file
35
target/amavis/postfix-amavis.cf
Normal file
|
|
@ -0,0 +1,35 @@
|
||||||
|
|
||||||
|
#
|
||||||
|
# Amavis configuration
|
||||||
|
#
|
||||||
|
|
||||||
|
smtp-amavis unix - - n - 2 smtp
|
||||||
|
-o syslog_name=postfix/$service_name
|
||||||
|
-o smtp_data_done_timeout=1200
|
||||||
|
-o smtp_send_xforward_command=yes
|
||||||
|
-o disable_dns_lookups=yes
|
||||||
|
-o max_use=20
|
||||||
|
-o smtp_tls_security_level=none
|
||||||
|
-o smtp_tls_wrappermode=no
|
||||||
|
|
||||||
|
127.0.0.1:10025 inet n - n - - smtpd
|
||||||
|
-o syslog_name=postfix/smtpd-amavis
|
||||||
|
-o content_filter=
|
||||||
|
-o local_recipient_maps=
|
||||||
|
-o relay_recipient_maps=
|
||||||
|
-o smtpd_restriction_classes=
|
||||||
|
-o smtpd_delay_reject=no
|
||||||
|
-o smtpd_client_restrictions=permit_mynetworks,reject
|
||||||
|
-o smtpd_helo_restrictions=
|
||||||
|
-o smtpd_sender_restrictions=
|
||||||
|
-o smtpd_recipient_restrictions=permit_mynetworks,reject
|
||||||
|
-o smtpd_data_restrictions=reject_unauth_pipelining
|
||||||
|
-o smtpd_end_of_data_restrictions=
|
||||||
|
-o mynetworks=127.0.0.0/8
|
||||||
|
-o smtpd_error_sleep_time=0
|
||||||
|
-o smtpd_soft_error_limit=1001
|
||||||
|
-o smtpd_hard_error_limit=1000
|
||||||
|
-o smtpd_client_connection_count_limit=0
|
||||||
|
-o smtpd_client_connection_rate_limit=0
|
||||||
|
-o receive_override_options=no_header_body_checks,no_unknown_recipient_checks,no_milters
|
||||||
|
-o smtp_tls_security_level=none
|
||||||
|
|
@ -6,15 +6,15 @@
|
||||||
# Do not forget to execute "postfix reload" after editing this file.
|
# Do not forget to execute "postfix reload" after editing this file.
|
||||||
#
|
#
|
||||||
# ==========================================================================
|
# ==========================================================================
|
||||||
# service type private unpriv chroot wakeup maxproc command + args
|
# service type private unpriv chroot wakeup maxproc command + args
|
||||||
# (yes) (yes) (no) (never) (100)
|
# (yes) (yes) (no) (never) (100)
|
||||||
# ==========================================================================
|
# ==========================================================================
|
||||||
|
|
||||||
smtp inet n - n - 1 postscreen
|
smtp inet n - n - 1 postscreen
|
||||||
smtpd pass - - n - - smtpd
|
smtpd pass - - n - - smtpd
|
||||||
tlsproxy unix - - n - 0 tlsproxy
|
tlsproxy unix - - n - 0 tlsproxy
|
||||||
dnsblog unix - - n - 0 dnsblog
|
dnsblog unix - - n - 0 dnsblog
|
||||||
submission inet n - n - - smtpd
|
submission inet n - n - - smtpd
|
||||||
-o syslog_name=postfix/submission
|
-o syslog_name=postfix/submission
|
||||||
-o smtpd_tls_security_level=encrypt
|
-o smtpd_tls_security_level=encrypt
|
||||||
-o smtpd_sasl_auth_enable=yes
|
-o smtpd_sasl_auth_enable=yes
|
||||||
|
|
@ -27,7 +27,7 @@ submission inet n - n - - smtpd
|
||||||
-o milter_macro_daemon_name=ORIGINATING
|
-o milter_macro_daemon_name=ORIGINATING
|
||||||
-o cleanup_service_name=sender-cleanup
|
-o cleanup_service_name=sender-cleanup
|
||||||
|
|
||||||
smtps inet n - n - - smtpd
|
smtps inet n - n - - smtpd
|
||||||
-o syslog_name=postfix/smtps
|
-o syslog_name=postfix/smtps
|
||||||
-o smtpd_tls_wrappermode=yes
|
-o smtpd_tls_wrappermode=yes
|
||||||
-o smtpd_sasl_auth_enable=yes
|
-o smtpd_sasl_auth_enable=yes
|
||||||
|
|
@ -40,74 +40,36 @@ smtps inet n - n - - smtpd
|
||||||
-o milter_macro_daemon_name=ORIGINATING
|
-o milter_macro_daemon_name=ORIGINATING
|
||||||
-o cleanup_service_name=sender-cleanup
|
-o cleanup_service_name=sender-cleanup
|
||||||
|
|
||||||
pickup fifo n - n 60 1 pickup
|
pickup fifo n - n 60 1 pickup
|
||||||
-o content_filter=
|
-o content_filter=
|
||||||
-o receive_override_options=no_header_body_checks
|
-o receive_override_options=no_header_body_checks
|
||||||
|
|
||||||
cleanup unix n - n - 0 cleanup
|
sender-cleanup unix n - n - 0 cleanup
|
||||||
qmgr unix n - n 300 1 qmgr
|
|
||||||
tlsmgr unix - - n 1000? 1 tlsmgr
|
|
||||||
rewrite unix - - n - - trivial-rewrite
|
|
||||||
bounce unix - - n - 0 bounce
|
|
||||||
defer unix - - n - 0 bounce
|
|
||||||
trace unix - - n - 0 bounce
|
|
||||||
verify unix - - n - 1 verify
|
|
||||||
flush unix n - n 1000? 0 flush
|
|
||||||
proxymap unix - - n - - proxymap
|
|
||||||
proxywrite unix - - n - 1 proxymap
|
|
||||||
smtp unix - - n - - smtp
|
|
||||||
relay unix - - n - - smtp
|
|
||||||
showq unix n - n - - showq
|
|
||||||
error unix - - n - - error
|
|
||||||
retry unix - - n - - error
|
|
||||||
discard unix - - n - - discard
|
|
||||||
local unix - n n - - local
|
|
||||||
virtual unix - n n - - virtual
|
|
||||||
lmtp unix - - n - - lmtp
|
|
||||||
anvil unix - - n - 1 anvil
|
|
||||||
scache unix - - n - 1 scache
|
|
||||||
|
|
||||||
sender-cleanup unix n - n - 0 cleanup
|
|
||||||
-o syslog_name=postfix/sender-cleanup
|
-o syslog_name=postfix/sender-cleanup
|
||||||
-o header_checks=pcre:/etc/postfix/maps/sender_header_filter.pcre
|
-o header_checks=pcre:/etc/postfix/maps/sender_header_filter.pcre
|
||||||
|
|
||||||
#
|
policyd-spf unix - n n - 0 spawn
|
||||||
# SPF configuration
|
|
||||||
#
|
|
||||||
policyd-spf unix - n n - 0 spawn
|
|
||||||
user=policyd-spf argv=/usr/bin/policyd-spf
|
user=policyd-spf argv=/usr/bin/policyd-spf
|
||||||
|
|
||||||
#
|
cleanup unix n - n - 0 cleanup
|
||||||
# Amavis configuration
|
qmgr unix n - n 300 1 qmgr
|
||||||
#
|
tlsmgr unix - - n 1000? 1 tlsmgr
|
||||||
|
rewrite unix - - n - - trivial-rewrite
|
||||||
smtp-amavis unix - - n - 2 smtp
|
bounce unix - - n - 0 bounce
|
||||||
-o syslog_name=postfix/$service_name
|
defer unix - - n - 0 bounce
|
||||||
-o smtp_data_done_timeout=1200
|
trace unix - - n - 0 bounce
|
||||||
-o smtp_send_xforward_command=yes
|
verify unix - - n - 1 verify
|
||||||
-o disable_dns_lookups=yes
|
flush unix n - n 1000? 0 flush
|
||||||
-o max_use=20
|
proxymap unix - - n - - proxymap
|
||||||
-o smtp_tls_security_level=none
|
proxywrite unix - - n - 1 proxymap
|
||||||
-o smtp_tls_wrappermode=no
|
smtp unix - - n - - smtp
|
||||||
|
relay unix - - n - - smtp
|
||||||
127.0.0.1:10025 inet n - n - - smtpd
|
showq unix n - n - - showq
|
||||||
-o syslog_name=postfix/smtpd-amavis
|
error unix - - n - - error
|
||||||
-o content_filter=
|
retry unix - - n - - error
|
||||||
-o local_recipient_maps=
|
discard unix - - n - - discard
|
||||||
-o relay_recipient_maps=
|
local unix - n n - - local
|
||||||
-o smtpd_restriction_classes=
|
virtual unix - n n - - virtual
|
||||||
-o smtpd_delay_reject=no
|
lmtp unix - - n - - lmtp
|
||||||
-o smtpd_client_restrictions=permit_mynetworks,reject
|
anvil unix - - n - 1 anvil
|
||||||
-o smtpd_helo_restrictions=
|
scache unix - - n - 1 scache
|
||||||
-o smtpd_sender_restrictions=
|
|
||||||
-o smtpd_recipient_restrictions=permit_mynetworks,reject
|
|
||||||
-o smtpd_data_restrictions=reject_unauth_pipelining
|
|
||||||
-o smtpd_end_of_data_restrictions=
|
|
||||||
-o mynetworks=127.0.0.0/8
|
|
||||||
-o smtpd_error_sleep_time=0
|
|
||||||
-o smtpd_soft_error_limit=1001
|
|
||||||
-o smtpd_hard_error_limit=1000
|
|
||||||
-o smtpd_client_connection_count_limit=0
|
|
||||||
-o smtpd_client_connection_rate_limit=0
|
|
||||||
-o receive_override_options=no_header_body_checks,no_unknown_recipient_checks,no_milters
|
|
||||||
-o smtp_tls_security_level=none
|
|
||||||
|
|
|
||||||
|
|
@ -73,6 +73,7 @@ function _setup_amavis
|
||||||
if [[ ${ENABLE_AMAVIS} -eq 1 ]]
|
if [[ ${ENABLE_AMAVIS} -eq 1 ]]
|
||||||
then
|
then
|
||||||
_log 'debug' 'Setting up Amavis'
|
_log 'debug' 'Setting up Amavis'
|
||||||
|
cat /etc/dms/postfix/master.d/postfix-amavis.cf >>/etc/postfix/master.cf
|
||||||
sed -i \
|
sed -i \
|
||||||
"s|^#\$myhostname = \"mail.example.com\";|\$myhostname = \"${HOSTNAME}\";|" \
|
"s|^#\$myhostname = \"mail.example.com\";|\$myhostname = \"${HOSTNAME}\";|" \
|
||||||
/etc/amavis/conf.d/05-node_id
|
/etc/amavis/conf.d/05-node_id
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue