From bb3643f22972c08362d77221f06da20f5812f6ca Mon Sep 17 00:00:00 2001
From: Sebastian Hugentobler <thallian@users.noreply.github.com>
Date: Fri, 28 Oct 2016 09:06:42 +0200
Subject: [PATCH] Update dovecot-ldap.conf.ext.tmpl

---
 .../templates/dovecot-ldap.conf.ext.tmpl      | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/rootfs/etc/confd/templates/dovecot-ldap.conf.ext.tmpl b/rootfs/etc/confd/templates/dovecot-ldap.conf.ext.tmpl
index 384c0dd..a545065 100644
--- a/rootfs/etc/confd/templates/dovecot-ldap.conf.ext.tmpl
+++ b/rootfs/etc/confd/templates/dovecot-ldap.conf.ext.tmpl
@@ -1,11 +1,11 @@
-uris = {{getenv "LDAPURI"}}
-dn = {{getenv "LDAPBINDDN"}}
-dnpass = {{getenv "LDAPBINDPASSWORD"}}
-tls = {{getenv "LDAPUSETLS"}}
+uris = {{getenv "LDAP_URI"}}
+dn = {{getenv "LDAP_BIND_DN"}}
+dnpass = {{getenv "LDAP_BIND_PASSWORD"}}
+tls = {{getenv "LDAP_USE_TLS" "yes"}}
 auth_bind = no
-base = {{getenv "LDAPBASEDN"}}
-scope = {{getenv "LDAPSCOPE"}}
-user_filter = {{getenv "LDAPUSERFILTER"}}
-pass_attrs = {{getenv "LDAPUSERATTRIBUTE"}}=user,{{getenv "LDAPPASSWORDATTRIBUTE"}}=password
-pass_filter = {{getenv "LDAPPASSFILTER"}}
-default_pass_scheme = {{getenv "LDAPDEFAULTPASSSCHEME"}}
+base = {{getenv "LDAP_BASE_DN"}}
+scope = {{getenv "LDAP_SCOPE" "subtree"}}
+user_filter = {{getenv "LDAP_USER_FILTER"}}
+pass_attrs = {{getenv "LDAP_USER_ATTRIBUTE" "cn"}}=user,{{getenv "LDAP_PASSWORD_ATTRIBUTE" "userPassword"}}=password
+pass_filter = {{getenv "LDAP_PASS_FILTER"}}
+default_pass_scheme = {{getenv "LDAP_DEFAULT_PASSSCHEME" "SSHA"}}