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.

Dockerfile

@@ -112,6 +112,7 @@ RUN <<EOF
 EOF
 
 COPY target/amavis/conf.d/* /etc/amavis/conf.d/
+COPY target/amavis/postfix-amavis.cf /etc/dms/postfix/master.d/
 RUN <<EOF
   sedfile -i -r 's/#(@|   \\%)bypass/\1bypass/g' /etc/amavis/conf.d/15-content_filter_mode
   # add users clamav and amavis to each others group

target/amavis/postfix-amavis.cf

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

target/postfix/master.cf

@@ -44,6 +44,13 @@ pickup    fifo  n       -       n       60      1       pickup
   -o content_filter=
   -o receive_override_options=no_header_body_checks
 
+sender-cleanup unix  n       -       n       -       0       cleanup
+  -o syslog_name=postfix/sender-cleanup
+  -o header_checks=pcre:/etc/postfix/maps/sender_header_filter.pcre
+
+policyd-spf    unix  -       n       n       -       0       spawn
+    user=policyd-spf argv=/usr/bin/policyd-spf
+
 cleanup        unix  n       -       n       -       0       cleanup
 qmgr           unix  n       -       n       300     1       qmgr
 tlsmgr         unix  -       -       n       1000?   1       tlsmgr
@@ -66,48 +73,3 @@ 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 header_checks=pcre:/etc/postfix/maps/sender_header_filter.pcre
-
-#
-# SPF configuration
-#
-policyd-spf  unix  -       n       n       -       0       spawn
-    user=policyd-spf argv=/usr/bin/policyd-spf
-
-#
-# 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

target/scripts/startup/setup-stack.sh

@@ -73,6 +73,7 @@ function _setup_amavis
   if [[ ${ENABLE_AMAVIS} -eq 1 ]]
   then
     _log 'debug' 'Setting up Amavis'
+    cat /etc/dms/postfix/master.d/postfix-amavis.cf >>/etc/postfix/master.cf
     sed -i \
       "s|^#\$myhostname = \"mail.example.com\";|\$myhostname = \"${HOSTNAME}\";|" \
       /etc/amavis/conf.d/05-node_id