Merge branch 'master' into fix-swarm-start

2018-10-06 23:48:32 +03:00
parent cc8e15748b 011f4e317b
commit d6c386651d
28 changed files with 563 additions and 43 deletions
--- a/core/postfix/Dockerfile
+++ b/core/postfix/Dockerfile
@@ -6,5 +6,6 @@ COPY conf /conf
 COPY start.py /start.py

 EXPOSE 25/tcp 10025/tcp
+VOLUME ["/data"]

 CMD /start.py
--- a/core/postfix/conf/master.cf
+++ b/core/postfix/conf/master.cf
@@ -8,6 +8,7 @@ smtp      inet  n       -       n       -       -       smtpd
 10025     inet  n       -       n       -       -       smtpd
  -o smtpd_sasl_auth_enable=yes
  -o smtpd_recipient_restrictions=reject_unlisted_sender,reject_authenticated_sender_login_mismatch,permit
+  -o smtpd_reject_unlisted_recipient={% if REJECT_UNLISTED_RECIPIENT %}{{ REJECT_UNLISTED_RECIPIENT }}{% else %}no{% endif %}
  -o cleanup_service_name=outclean
 outclean  unix n       -       n       -       0       cleanup
  -o header_checks=pcre:/etc/postfix/outclean_header_filter.cf