diff --git a/Dockerfile b/Dockerfile index e7026e3..e8e1684 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,10 +3,11 @@ LABEL maintainer "Mauro Torrez " ARG DEBIAN_FRONTEND=noninteractive ENV LC_ALL C -ENV MYDESTINATION='localhost.localdomain, localhost' +ENV MYDESTINATION="localhost.localdomain, localhost" ENV MYHOSTNAME=mail.example.com ENV MYDOMAIN=example.com -ENV MYNETWORKS='127.0.0.0/8, [::ffff:127.0.0.0]/104, [::1]/128' +ENV MYNETWORKS="" +ENV MYNETWORKS_STYLE=class ENV VIRTUAL_ALIAS_MAPS= ENV VIRTUAL_MAILBOX_MAPS= ENV VIRTUAL_TRANSPORT=lmtp:dovecot:24 @@ -20,7 +21,7 @@ ENV SMTP_TLS_SECURITY_LEVEL=may ENV SMTPD_TLS_SECURITY_LEVEL=may ENV SMTPD_TLS_AUTH_ONLY=no ENV SMTPD_TLS_SESSION_CACHE_DATABASE="btree:\${data_directory}/smtpd_scache" -ENV SMTPD_CLIENT_RESTRICTIONS="check_client_access pcre:/etc/postfix/rules/client_access_list, permit_sasl_authenticated, permit_mynetworks, reject_unknown_client_hostname, reject_unauth_pipelining, permit" +ENV SMTPD_CLIENT_RESTRICTIONS="check_client_access pcre:/etc/postfix/rules/client_access_list, permit_sasl_authenticated, permit_mynetworks, reject_unknown_client_hostname, reject_unauth_pipelining, reject" ENV SMTPD_DATA_RESTRICTIONS="reject_unauth_pipelining, permit" ENV SMTPD_HELO_RESTRICTIONS="check_helo_access hash:/etc/postfix/rules/helo_access_list, permit_mynetworks, reject_non_fqdn_helo_hostname, reject_invalid_helo_hostname, warn_if_reject, permit" ENV SMTPD_RELAY_RESTRICTIONS="permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination, permit" diff --git a/confd/conf.d/setup_main.toml b/confd/conf.d/setup_main.toml index c3f188e..e8c0822 100644 --- a/confd/conf.d/setup_main.toml +++ b/confd/conf.d/setup_main.toml @@ -7,6 +7,7 @@ keys = [ "/myhostname", "/mydomain", "/mynetworks", +"/mynetworks/style", "/virtual/alias/maps", "/virtual/mailbox/maps", "/virtual/transport", diff --git a/confd/templates/setup_main.tmpl b/confd/templates/setup_main.tmpl index ae36d9b..1c44d49 100644 --- a/confd/templates/setup_main.tmpl +++ b/confd/templates/setup_main.tmpl @@ -36,6 +36,7 @@ postconf maillog_file=/dev/stdout {{ with getv "/myhostname" }}postconf myhostname='{{.}}'{{ end }} {{ with getv "/mydomain" }}postconf mydomain='{{.}}'{{ 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 }}