From 216def8490ab619080af84c32b2d0da3d9eaf7ad Mon Sep 17 00:00:00 2001
From: mpanneck <37032012+mpanneck@users.noreply.github.com>
Date: Sat, 3 Nov 2018 21:52:17 +0100
Subject: [PATCH] add LDAP_QUERY_FILTER_DOMAIN env to documentation (#1070)

* added LDAP_QUERY_FILTER_DOMAIN env
* updated docs for LDAP_QUERY_FILTER_DOMAIN env

additionally removed unnecessary quotation marks in example ldap.yml
---
 .env.dist                   |  4 ++++
 README.md                   | 16 +++++++++++-----
 docker-compose.elk.yml.dist |  1 +
 docker-compose.yml.dist     |  1 +
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/.env.dist b/.env.dist
index 0b19e360..0c279b85 100644
--- a/.env.dist
+++ b/.env.dist
@@ -202,6 +202,10 @@ LDAP_QUERY_FILTER_GROUP=
 # => Specify how ldap should be asked for aliases
 LDAP_QUERY_FILTER_ALIAS=
 
+# e.g. `"(&(|(mail=*@%s)(mailalias=*@%s)(mailGroupMember=*@%s))(mailEnabled=TRUE))"`
+# => Specify how ldap should be asked for domains
+LDAP_QUERY_FILTER_DOMAIN=
+
 # -----------------------------------------------------------------------------------------------------------------------------
 # ---------------- Dovecot section --------------------------------------------------------------------------------------------
 # -----------------------------------------------------------------------------------------------------------------------------
diff --git a/README.md b/README.md
index 9851731b..2a0c6fcd 100644
--- a/README.md
+++ b/README.md
@@ -178,11 +178,12 @@ services:
       - LDAP_SEARCH_BASE=ou=people,dc=localhost,dc=localdomain
       - LDAP_BIND_DN=cn=admin,dc=localhost,dc=localdomain
       - LDAP_BIND_PW=admin
-      - LDAP_QUERY_FILTER_USER="(&(mail=%s)(mailEnabled=TRUE))"
-      - LDAP_QUERY_FILTER_GROUP="(&(mailGroupMember=%s)(mailEnabled=TRUE))"
-      - LDAP_QUERY_FILTER_ALIAS="(&(mailAlias=%s)(mailEnabled=TRUE))"
-      - DOVECOT_PASS_FILTER="(&(objectClass=PostfixBookMailAccount)(uniqueIdentifier=%n))"
-      - DOVECOT_USER_FILTER="(&(objectClass=PostfixBookMailAccount)(uniqueIdentifier=%n))"
+      - LDAP_QUERY_FILTER_USER=(&(mail=%s)(mailEnabled=TRUE))
+      - LDAP_QUERY_FILTER_GROUP=(&(mailGroupMember=%s)(mailEnabled=TRUE))
+      - LDAP_QUERY_FILTER_ALIAS=(&(mailAlias=%s)(mailEnabled=TRUE))
+      - LDAP_QUERY_FILTER_DOMAIN=(&(|(mail=*@%s)(mailalias=*@%s)(mailGroupMember=*@%s))(mailEnabled=TRUE))
+      - DOVECOT_PASS_FILTER=(&(objectClass=PostfixBookMailAccount)(uniqueIdentifier=%n))
+      - DOVECOT_USER_FILTER=(&(objectClass=PostfixBookMailAccount)(uniqueIdentifier=%n))
       - ENABLE_SASLAUTHD=1
       - SASLAUTHD_MECHANISMS=ldap
       - SASLAUTHD_LDAP_SERVER=ldap
@@ -452,6 +453,11 @@ Note: this spamassassin setting needs `ENABLE_SPAMASSASSIN=1`
 
   - e.g. `"(&(mailAlias=%s)(mailEnabled=TRUE))"`
   - => Specify how ldap should be asked for aliases
+  
+##### LDAP_QUERY_FILTER_DOMAIN
+
+- e.g. `"(&(|(mail=*@%s)(mailalias=*@%s)(mailGroupMember=*@%s))(mailEnabled=TRUE))"`
+- => Specify how ldap should be asked for domains
 
 ##### DOVECOT_TLS
 
diff --git a/docker-compose.elk.yml.dist b/docker-compose.elk.yml.dist
index 1dea1890..4058713a 100644
--- a/docker-compose.elk.yml.dist
+++ b/docker-compose.elk.yml.dist
@@ -52,6 +52,7 @@ services:
     - LDAP_QUERY_FILTER_USER=${LDAP_QUERY_FILTER_USER}
     - LDAP_QUERY_FILTER_GROUP=${LDAP_QUERY_FILTER_GROUP}
     - LDAP_QUERY_FILTER_ALIAS=${LDAP_QUERY_FILTER_ALIAS}
+    - LDAP_QUERY_FILTER_DOMAIN=${LDAP_QUERY_FILTER_DOMAIN}
     - DOVECOT_TLS=${DOVECOT_TLS}
     - DOVECOT_USER_FILTER=${DOVECOT_USER_FILTER}
     - DOVECOT_PASS_FILTER=${DOVECOT_PASS_FILTER}
diff --git a/docker-compose.yml.dist b/docker-compose.yml.dist
index d8f4ead5..5f907687 100644
--- a/docker-compose.yml.dist
+++ b/docker-compose.yml.dist
@@ -54,6 +54,7 @@ services:
     - LDAP_QUERY_FILTER_USER=${LDAP_QUERY_FILTER_USER}
     - LDAP_QUERY_FILTER_GROUP=${LDAP_QUERY_FILTER_GROUP}
     - LDAP_QUERY_FILTER_ALIAS=${LDAP_QUERY_FILTER_ALIAS}
+    - LDAP_QUERY_FILTER_DOMAIN=${LDAP_QUERY_FILTER_DOMAIN}
     - DOVECOT_TLS=${DOVECOT_TLS}
     - DOVECOT_USER_FILTER=${DOVECOT_USER_FILTER}
     - DOVECOT_PASS_FILTER=${DOVECOT_PASS_FILTER}