From 75dc1d4eb89e1ab43dde4488903f1c1728c2be4a Mon Sep 17 00:00:00 2001 From: alinmear Date: Sun, 2 Jul 2017 23:02:58 +0200 Subject: [PATCH] Add DOVECOT Vars to Makefile; commented USER and PASS FILTER --- Makefile | 26 ++++++++++++++------------ target/start-mailserver.sh | 5 +++-- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index a1253d3b..e0695097 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ run: -e PERMIT_DOCKER=host \ -e DMS_DEBUG=0 \ -h mail.my-domain.com -t $(NAME) - # sleep 15 + sleep 15 docker run -d --name mail_pop3 \ -v "`pwd`/test/config":/tmp/docker-mailserver \ -v "`pwd`/test":/tmp/docker-mailserver-test \ @@ -43,7 +43,7 @@ run: -e DMS_DEBUG=1 \ -e SSL_TYPE=letsencrypt \ -h mail.my-domain.com -t $(NAME) - # sleep 15 + sleep 15 docker run -d --name mail_smtponly \ -v "`pwd`/test/config":/tmp/docker-mailserver \ -v "`pwd`/test":/tmp/docker-mailserver-test \ @@ -51,14 +51,14 @@ run: -e PERMIT_DOCKER=network \ -e OVERRIDE_HOSTNAME=mail.my-domain.com \ -t $(NAME) - # sleep 15 + sleep 15 docker run -d --name mail_smtponly_without_config \ -e SMTP_ONLY=1 \ -e ENABLE_LDAP=1 \ -e PERMIT_DOCKER=network \ -e OVERRIDE_HOSTNAME=mail.mydomain.com \ -t $(NAME) - # sleep 15 + sleep 15 docker run -d --name mail_override_hostname \ -v "`pwd`/test/config":/tmp/docker-mailserver \ -v "`pwd`/test":/tmp/docker-mailserver-test \ @@ -66,28 +66,28 @@ run: -e OVERRIDE_HOSTNAME=mail.my-domain.com \ -h mail.my-domain.com \ -t $(NAME) - # sleep 15 + sleep 15 docker run -d --name mail_fail2ban \ -v "`pwd`/test/config":/tmp/docker-mailserver \ -v "`pwd`/test":/tmp/docker-mailserver-test \ -e ENABLE_FAIL2BAN=1 \ --cap-add=NET_ADMIN \ -h mail.my-domain.com -t $(NAME) - # sleep 15 + sleep 15 docker run -d --name mail_fetchmail \ -v "`pwd`/test/config":/tmp/docker-mailserver \ -v "`pwd`/test":/tmp/docker-mailserver-test \ -e ENABLE_FETCHMAIL=1 \ --cap-add=NET_ADMIN \ -h mail.my-domain.com -t $(NAME) - # sleep 15 + sleep 15 docker run -d --name mail_disabled_clamav_spamassassin \ -v "`pwd`/test/config":/tmp/docker-mailserver \ -v "`pwd`/test":/tmp/docker-mailserver-test \ -e ENABLE_CLAMAV=0 \ -e ENABLE_SPAMASSASSIN=0 \ -h mail.my-domain.com -t $(NAME) - # sleep 15 + sleep 15 docker run -d --name mail_manual_ssl \ -v "`pwd`/test/config":/tmp/docker-mailserver \ -v "`pwd`/test":/tmp/docker-mailserver-test \ @@ -95,7 +95,7 @@ run: -e SSL_CERT_PATH=/tmp/docker-mailserver/letsencrypt/mail.my-domain.com/fullchain.pem \ -e SSL_KEY_PATH=/tmp/docker-mailserver/letsencrypt/mail.my-domain.com/privkey.pem \ -h mail.my-domain.com -t $(NAME) - # sleep 15 + sleep 15 docker run -d --name ldap_for_mail \ -e LDAP_DOMAIN="localhost.localdomain" \ -h ldap.my-domain.com -t ldap @@ -111,6 +111,8 @@ run: -e LDAP_QUERY_FILTER_USER="(&(mail=%s)(mailEnabled=TRUE))" \ -e LDAP_QUERY_FILTER_GROUP="(&(mailGroupMember=%s)(mailEnabled=TRUE))" \ -e LDAP_QUERY_FILTER_ALIAS="(&(mailAlias=%s)(mailEnabled=TRUE))" \ + -e DOVECOT_PASS_FILTER="(&(objectClass=PostfixBookMailAccount)(uniqueIdentifier=%n))" \ + -e DOVECOT_USER_FILTER="(&(objectClass=PostfixBookMailAccount)(uniqueIdentifier=%n))" \ -e ENABLE_SASLAUTHD=1 \ -e SASLAUTHD_MECHANISMS=ldap \ -e SASLAUTHD_LDAP_SERVER=ldap \ @@ -120,7 +122,7 @@ run: -e POSTMASTER_ADDRESS=postmaster@localhost.localdomain \ --link ldap_for_mail:ldap \ -h mail.my-domain.com -t $(NAME) - # sleep 15 + sleep 15 docker run -d --name mail_with_imap \ -v "`pwd`/test/config":/tmp/docker-mailserver \ -v "`pwd`/test":/tmp/docker-mailserver-test \ @@ -130,7 +132,7 @@ run: -e POSTMASTER_ADDRESS=postmaster@localhost.localdomain \ -h mail.my-domain.com -t $(NAME) # Wait for containers to fully start - # sleep 15 + sleep 15 docker run -d --name mail_lmtp_ip \ -v "`pwd`/test/config":/tmp/docker-mailserver \ -v "`pwd`/test/config/dovecot-lmtp":/etc/dovecot \ @@ -138,7 +140,7 @@ run: -e ENABLE_POSTFIX_VIRTUAL_TRANSPORT=1 \ -e POSTFIX_DAGENT=lmtp:127.0.0.1:24 \ -h mail.my-domain.com -t $(NAME) - # sleep 30 + sleep 30 docker run -d --name mail_with_postgrey \ -v "`pwd`/test/config":/tmp/docker-mailserver \ -v "`pwd`/test":/tmp/docker-mailserver-test \ diff --git a/target/start-mailserver.sh b/target/start-mailserver.sh index da0f5ec4..b6c28dda 100644 --- a/target/start-mailserver.sh +++ b/target/start-mailserver.sh @@ -590,8 +590,9 @@ function _setup_ldap() { _dovecot_ldap_mapping["DOVECOT_DN"]="${DOVECOT_DN:="${LDAP_BIND_DN}"}" _dovecot_ldap_mapping["DOVECOT_DNPASS"]="${DOVECOT_DNPASS:="${LDAP_BIND_PW}"}" _dovecot_ldap_mapping["DOVECOT_HOSTS"]="${DOVECOT_HOSTS:="${LDAP_SERVER_HOST}"}" - _dovecot_ldap_mapping["DOVECOT_PASS_FILTER"]="${DOVECOT_PASS_FILTER:="${LDAP_QUERY_FILTER_USER}"}" - _dovecot_ldap_mapping["DOVECOT_USER_FILTER"]="${DOVECOT_USER_FILTER:="${LDAP_QUERY_FILTER_USER}"}" + # Not sure whether this can be the same or not + # _dovecot_ldap_mapping["DOVECOT_PASS_FILTER"]="${DOVECOT_PASS_FILTER:="${LDAP_QUERY_FILTER_USER}"}" + # _dovecot_ldap_mapping["DOVECOT_USER_FILTER"]="${DOVECOT_USER_FILTER:="${LDAP_QUERY_FILTER_USER}"}" for var in ${!_dovecot_ldap_mapping[@]}; do export $var=${_dovecot_ldap_mapping[$var]}