From c01a8571472bb102e8cb7be8cd97ebc24b458ed9 Mon Sep 17 00:00:00 2001 From: andryyy Date: Sun, 15 Jan 2017 17:43:12 +0100 Subject: [PATCH 1/6] Ignore nginx active listener --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 5c459500..23f9e430 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ data/conf/sogo/sieve.creds data/conf/dovecot/dovecot-master.passwd mailcow.conf mailcow.conf_backup +data/conf/nginx/listen.active From 5fa794174c2733b1b15d138a753ae2a916b6630d Mon Sep 17 00:00:00 2001 From: andryyy Date: Sun, 15 Jan 2017 17:43:34 +0100 Subject: [PATCH 2/6] Fix EAS in SOGo --- data/conf/nginx/site.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/conf/nginx/site.conf b/data/conf/nginx/site.conf index d754eae1..0ea01dfe 100644 --- a/data/conf/nginx/site.conf +++ b/data/conf/nginx/site.conf @@ -57,7 +57,7 @@ server { } location ^~ /Microsoft-Server-ActiveSync { - proxy_pass http://sogo/SOGo/Microsoft-Server-ActiveSync; + proxy_pass http://sogo:20000/SOGo/Microsoft-Server-ActiveSync; proxy_connect_timeout 1000; proxy_next_upstream timeout error; proxy_send_timeout 1000; From e683faac1b367d18b294cbe156c5bc6b75f6ff38 Mon Sep 17 00:00:00 2001 From: andryyy Date: Sun, 22 Jan 2017 16:42:14 +0100 Subject: [PATCH 3/6] Add libsasl2-modules --- data/Dockerfiles/postfix/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/data/Dockerfiles/postfix/Dockerfile b/data/Dockerfiles/postfix/Dockerfile index bc6015d7..a3781bd4 100644 --- a/data/Dockerfiles/postfix/Dockerfile +++ b/data/Dockerfiles/postfix/Dockerfile @@ -13,6 +13,7 @@ RUN apt-get update RUN apt-get install -y --no-install-recommends supervisor \ postfix \ sasl2-bin \ + libsasl2-modules \ postfix \ postfix-mysql \ postfix-pcre \ From 7959abfcdce3b28d386ce7b44d847ef023bd68fc Mon Sep 17 00:00:00 2001 From: andryyy Date: Mon, 23 Jan 2017 08:24:22 +0100 Subject: [PATCH 4/6] Add mydestination to prevent hostname == domain situations --- data/conf/postfix/main.cf | 1 + 1 file changed, 1 insertion(+) diff --git a/data/conf/postfix/main.cf b/data/conf/postfix/main.cf index 4f365677..d064e2d0 100644 --- a/data/conf/postfix/main.cf +++ b/data/conf/postfix/main.cf @@ -90,3 +90,4 @@ virtual_uid_maps = static:5000 smtpd_milters = inet:rmilter:9900 non_smtpd_milters = inet:rmilter:9900 milter_mail_macros = i {mail_addr} {client_addr} {client_name} {auth_authen} +mydestination = localhost.localdomain, localhost From a62fdd4ee50a56eab2b3ba4c7f660390c938977b Mon Sep 17 00:00:00 2001 From: Tudor Georgescu Date: Mon, 23 Jan 2017 15:27:42 +0000 Subject: [PATCH 5/6] Don't ask for mailcow hostname and time zone if already exported within the shell --- generate_config.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/generate_config.sh b/generate_config.sh index cb1a516e..5ae9495d 100755 --- a/generate_config.sh +++ b/generate_config.sh @@ -12,8 +12,13 @@ if [[ -f mailcow.conf ]]; then esac fi -read -p "Hostname (FQDN): " -ei "mx.example.org" MAILCOW_HOSTNAME -read -p "Timezone: " -ei "Europe/Berlin" TZ +if [ -z "$MAILCOW_HOSTNAME" ]; then + read -p "Hostname (FQDN): " -ei "mx.example.org" MAILCOW_HOSTNAME +fi + +if [ -z "$TZ" ]; then + read -p "Timezone: " -ei "Europe/Berlin" TZ +fi cat << EOF > mailcow.conf # ------------------------------ From 89565d8ac1194c6abbe67ff09f47c4dca0130f0a Mon Sep 17 00:00:00 2001 From: Lars Gleim Date: Mon, 23 Jan 2017 21:21:36 +0100 Subject: [PATCH 6/6] Update main.cf --- data/conf/postfix/main.cf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/conf/postfix/main.cf b/data/conf/postfix/main.cf index d064e2d0..1a96eff2 100644 --- a/data/conf/postfix/main.cf +++ b/data/conf/postfix/main.cf @@ -56,7 +56,7 @@ smtpd_error_sleep_time = 10s smtpd_hard_error_limit = ${stress?1}${stress:5} smtpd_helo_required = yes smtpd_proxy_timeout = 600s -smtpd_recipient_restrictions = check_recipient_access proxy:mysql:/opt/postfix/conf/sql/mysql_tls_enforce_in_policy.cf, permit_sasl_authenticated, permit_mynetworks, reject_invalid_helo_hostname, reject_unknown_reverse_client_hostname, reject_unauth_destination +smtpd_recipient_restrictions = permit_sasl_authenticated, permit_mynetworks, check_recipient_access proxy:mysql:/opt/postfix/conf/sql/mysql_tls_enforce_in_policy.cf, reject_invalid_helo_hostname, reject_unknown_reverse_client_hostname, reject_unauth_destination smtpd_sasl_auth_enable = yes smtpd_sasl_authenticated_header = yes smtpd_sasl_path = inet:dovecot:10001