mauro/docker-image-postfix
1
0
Fork 0
Code Issues Pull Requests Actions Releases Wiki Activity

Disable SMTPUTF8 by default
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/tag Build is passing
Details

Browse Source
This commit is contained in:
Mauro Torrez
2022-12-16 19:26:42 -03:00
parent de65305e35
commit 86ebc1a6a2
7 changed files with 86 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
confd/conf.d/setup_main.toml
View File

@@ -3,30 +3,31 @@ src = "setup_main.tmpl"
dest = "/start.d/setup_main"
mode = "0755"
keys = [
"/biff",
"/message/size/limit",
"/mydestination",
"/myhostname",
"/mydomain",
"/myhostname",
"/mynetworks",
"/mynetworks/style",
"/virtual/alias/maps",
"/virtual/mailbox/maps",
"/virtual/transport",
"/virtual/mailbox/domains",
"/smtpd/sasl/path",
"/smtpd/sasl/type",
"/smtpd/sasl/auth/enable",
"/smtpd/tls/cert/file",
"/smtpd/tls/key/file",
"/smtp/tls/security/level",
"/smtpd/tls/security/level",
"/smtpd/tls/auth/only",
"/smtpd/tls/session/cache/database",
"/smtpd/client/restrictions",
"/smtpd/data/restrictions",
"/smtpd/helo/restrictions",
"/smtpd/relay/restrictions",
"/smtpd/recipient/restrictions",
"/message/size/limit",
"/smtpd/helo/required",
"/biff",
"/smtpd/helo/restrictions",
"/smtpd/recipient/restrictions",
"/smtpd/relay/restrictions",
"/smtpd/sasl/auth/enable",
"/smtpd/sasl/path",
"/smtpd/sasl/type",
"/smtpd/tls/auth/only",
"/smtpd/tls/cert/file",
"/smtpd/tls/key/file",
"/smtpd/tls/security/level",
"/smtpd/tls/session/cache/database",
"/smtputf8/enable",
"/virtual/alias/maps",
"/virtual/mailbox/domains",
"/virtual/mailbox/maps",
"/virtual/transport",
]

6
confd/conf.d/setup_milter.toml
View File

@@ -3,8 +3,8 @@ src = "setup_milter.tmpl"
dest = "/start.d/setup_milter"
mode = "0755"
keys = [
"/smtpd/milters",
"/non/smtpd/milters",
"/milter/default/action",
"/internal/mail/filter/classes",
"/milter/default/action",
"/non/smtpd/milters",
"/smtpd/milters",
]

8
confd/conf.d/setup_postscreen.toml
View File

@@ -3,14 +3,14 @@ src = "setup_postscreen.tmpl"
dest = "/start.d/setup_postscreen"
mode = "0755"
keys = [
"/postscreen/enable",
"/bogofilter/enable",
"/postscreen/access/list",
"/postscreen/blacklist/action",
"/postscreen/dnsbl/sites",
"/postscreen/dnsbl/reply/map",
"/postscreen/dnsbl/action",
"/postscreen/dnsbl/reply/map",
"/postscreen/dnsbl/sites",
"/postscreen/dnsbl/threshold",
"/postscreen/dnsbl/whitelist/threshold",
"/postscreen/enable",
"/postscreen/greet/action",
"/bogofilter/enable",
]

37
confd/templates/setup_main.tmpl
View File

@@ -33,32 +33,33 @@
postconf maillog_file=/dev/stdout
postconf alias_maps=hash:/etc/aliases
{{ with getv "/biff" }}postconf biff='{{.}}'{{ end }}
{{ with getv "/message/size/limit" }}postconf message_size_limit='{{.}}'{{ end }}
{{ with getv "/mydestination" }}postconf mydestination='{{.}}'{{ end }}
{{ with getv "/myhostname" }}postconf myhostname='{{.}}'{{ end }}
{{ with getv "/mydomain" }}postconf mydomain='{{.}}'{{ end }}
{{ with getv "/myhostname" }}postconf myhostname='{{.}}'{{ end }}
{{ with getv "/mynetworks" }}postconf mynetworks='{{.}}'{{ end }}
{{ with getv "/mynetworks/style" }}postconf mynetworks_style='{{.}}'{{ end }}
{{ with getv "/virtual/alias/maps" }}postconf virtual_alias_maps='{{.}}'{{ end }}
{{ with getv "/virtual/mailbox/maps" }}postconf virtual_mailbox_maps='{{.}}'{{ end }}
{{ with getv "/virtual/transport" }}postconf virtual_transport='{{.}}'{{ end }}
{{ with getv "/virtual/mailbox/domains" }}postconf virtual_mailbox_domains='{{.}}'{{ end }}
{{ with getv "/smtpd/sasl/path" }}postconf smtpd_sasl_path='{{.}}'{{ end }}
{{ with getv "/smtpd/sasl/type" }}postconf smtpd_sasl_type='{{.}}'{{ end }}
{{ with getv "/smtpd/sasl/auth/enable" }}postconf smtpd_sasl_auth_enable='{{.}}'{{ end }}
{{ with getv "/smtpd/tls/cert/file" }}postconf smtpd_tls_cert_file='{{.}}'{{ end }}
{{ with getv "/smtpd/tls/key/file" }}postconf smtpd_tls_key_file='{{.}}'{{ end }}
{{ with getv "/smtp/tls/security/level" }}postconf smtp_tls_security_level='{{.}}'{{ end }}
{{ with getv "/smtpd/tls/security/level" }}postconf smtpd_tls_security_level='{{.}}'{{ end }}
{{ with getv "/smtpd/tls/auth/only" }}postconf smtpd_tls_auth_only='{{.}}'{{ end }}
{{ with getv "/smtpd/tls/session/cache/database" }}postconf smtpd_tls_session_cache_database='{{.}}'{{ end }}
{{ with getv "/smtpd/client/restrictions" }}postconf smtpd_client_restrictions='{{.}}'{{ end }}
{{ with getv "/smtpd/data/restrictions" }}postconf smtpd_data_restrictions='{{.}}'{{ end }}
{{ with getv "/smtpd/helo/restrictions" }}postconf smtpd_helo_restrictions='{{.}}'{{ end }}
{{ with getv "/smtpd/relay/restrictions" }}postconf smtpd_relay_restrictions='{{.}}'{{ end }}
{{ with getv "/smtpd/recipient/restrictions" }}postconf smtpd_recipient_restrictions='{{.}}'{{ end }}
{{ with getv "/message/size/limit" }}postconf message_size_limit='{{.}}'{{ end }}
{{ with getv "/smtpd/helo/required" }}postconf smtpd_helo_required='{{.}}'{{ end }}
{{ with getv "/biff" }}postconf biff='{{.}}'{{ end }}
{{ with getv "/smtpd/helo/restrictions" }}postconf smtpd_helo_restrictions='{{.}}'{{ end }}
{{ with getv "/smtpd/recipient/restrictions" }}postconf smtpd_recipient_restrictions='{{.}}'{{ end }}
{{ with getv "/smtpd/relay/restrictions" }}postconf smtpd_relay_restrictions='{{.}}'{{ end }}
{{ with getv "/smtpd/sasl/auth/enable" }}postconf smtpd_sasl_auth_enable='{{.}}'{{ end }}
{{ with getv "/smtpd/sasl/path" }}postconf smtpd_sasl_path='{{.}}'{{ end }}
{{ with getv "/smtpd/sasl/type" }}postconf smtpd_sasl_type='{{.}}'{{ end }}
{{ with getv "/smtpd/tls/auth/only" }}postconf smtpd_tls_auth_only='{{.}}'{{ end }}
{{ with getv "/smtpd/tls/cert/file" }}postconf smtpd_tls_cert_file='{{.}}'{{ end }}
{{ with getv "/smtpd/tls/key/file" }}postconf smtpd_tls_key_file='{{.}}'{{ end }}
{{ with getv "/smtpd/tls/security/level" }}postconf smtpd_tls_security_level='{{.}}'{{ end }}
{{ with getv "/smtpd/tls/session/cache/database" }}postconf smtpd_tls_session_cache_database='{{.}}'{{ end }}
{{ with getv "/smtputf8/enable" }}postconf smtputf8_enable='{{.}}'{{ end }}
{{ with getv "/virtual/alias/maps" }}postconf virtual_alias_maps='{{.}}'{{ end }}
{{ with getv "/virtual/mailbox/domains" }}postconf virtual_mailbox_domains='{{.}}'{{ end }}
{{ with getv "/virtual/mailbox/maps" }}postconf virtual_mailbox_maps='{{.}}'{{ end }}
{{ with getv "/virtual/transport" }}postconf virtual_transport='{{.}}'{{ end }}
postconf -M spamfilter/unix | grep -q spamfilter || {
postconf -M spamfilter/unix="spamfilter unix - n n - - pipe"

6
confd/templates/setup_milter.tmpl
View File

@@ -1,6 +1,6 @@
#!/bin/bash
{{ with getv "/smtpd/milters" }}postconf smtpd_milters='{{.}}'{{ end }}
{{ with getv "/non/smtpd/milters" }}postconf non_smtpd_milters='{{.}}'{{ end }}
{{ with getv "/milter/default/action" }}postconf milter_default_action='{{.}}'{{ end }}
{{ with getv "/internal/mail/filter/classes" }}postconf internal_mail_filter_classes='{{.}}'{{ end }}
{{ with getv "/milter/default/action" }}postconf milter_default_action='{{.}}'{{ end }}
{{ with getv "/non/smtpd/milters" }}postconf non_smtpd_milters='{{.}}'{{ end }}
{{ with getv "/smtpd/milters" }}postconf smtpd_milters='{{.}}'{{ end }}

4
confd/templates/setup_postscreen.tmpl
View File

@@ -66,9 +66,9 @@ touch /etc/postfix/rules/postscreen_dnsbl_mask.pcre
# FIXME: allow un-setting options by blanking variable values
{{ with getv "/postscreen/access/list" }}postconf -e postscreen_access_list='{{.}}'{{ end }}
{{ with getv "/postscreen/blacklist/action" }}postconf -e postscreen_blacklist_action='{{.}}'{{ end }}
{{ with getv "/postscreen/dnsbl/sites" }}postconf -e postscreen_dnsbl_sites='{{.}}'{{ end }}
{{ with getv "/postscreen/dnsbl/reply/map" }}postconf -e postscreen_dnsbl_reply_map='{{.}}'{{ end }}
{{ with getv "/postscreen/dnsbl/action" }}postconf -e postscreen_dnsbl_action='{{.}}'{{ end }}
{{ with getv "/postscreen/dnsbl/reply/map" }}postconf -e postscreen_dnsbl_reply_map='{{.}}'{{ end }}
{{ with getv "/postscreen/dnsbl/sites" }}postconf -e postscreen_dnsbl_sites='{{.}}'{{ end }}
{{ with getv "/postscreen/dnsbl/threshold" }}postconf -e postscreen_dnsbl_threshold='{{.}}'{{ end }}
{{ with getv "/postscreen/dnsbl/whitelist/threshold" }}postconf -e postscreen_dnsbl_whitelist_threshold='{{.}}'{{ end }}
{{ with getv "/postscreen/greet/action" }}postconf -e postscreen_greet_action='{{.}}'{{ end }}