From 287a6e604369f97dff36efed24531ae270d8be5c Mon Sep 17 00:00:00 2001
From: Sebastian Hugentobler <sebastian@vanwa.ch>
Date: Mon, 23 Aug 2021 16:09:40 +0200
Subject: [PATCH] debug oauth

---
 README.md                                     | 61 +------------------
 .../confd/templates/auth-oauth2.conf.ext.tmpl |  2 +-
 2 files changed, 2 insertions(+), 61 deletions(-)

diff --git a/README.md b/README.md
index bb8d955..a35e822 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,9 @@
-[Dovecot](http://www.dovecot.org/) with imap, starttls, ldap authentication, sieve rules in ldap.
+[Dovecot](http://www.dovecot.org/) with imap, starttls, oauth2 and sieve rules.
 
 Uses [SSMTP](https://packages.debian.org/stable/mail/ssmtp) to send mails (for example if you have a redirect sieve rule).
 
 # Volumes
 - `/var/lib/vmail/mail`
-- `/etc/ssl/mail:ro`: certificates have to be here.
 
 # Environment Variables
 ## HOSTNAME
@@ -29,56 +28,6 @@ Which authentication mechanism to use for the smtp relay.
 
 Whether to use starttls for the smtp relay.
 
-## LDAP_HOST
-Ldap hostname (can include the port).
-
-## LDAP_SIEVE_HOST
-Has to be the same as `LDAP_URI` but in a different format (like `ldap:389`).
-
-## LDAP_BIND_DN
-DN used to authenticate against ldap.
-
-## LDAP_BIND_PASSWORD
-Password used to authenticate against ldap.
-
-## LDAP_BASE_DN
-Base DN to look for users on the ldap host.
-
-## LDAP_SCOPE
-- default: subtree
-
-Search scope of ldap queries.
-
-## LDAP_PASS_FILTER
-Specifies the filter on how user is found on the ldap host.
-[Dovecot variables](http://wiki2.dovecot.org/Variables) can be used.
-
-## LDAP_USER_ATTRIBUTE
-- default: cn
-
-The ldap attribute which stands for the username.
-
-## LDAP_PASSWORD_ATTRIBUTE
-- default: userPassword
-
-The ldap attribute which stands for the password.
-
-## LDAP_SIEVE_ATTRIBUTE
-- default: sieve
-
-The ldap attribute which contains the sieve rules.
-
-## LDAP_USE_TLS
-- default: yes
-
-Whether to use tls when connecting to the ldap host.
-
-## LDAP_APP_PASSWORDS_BASE_DN
-Base DN to look for app passwords for a user.
-
-## LDAP_APP_PASSWORDS_FILTER
-Specifies the filter on what counts as an app password.
-
 ## ALLOWED_USERNAME_CHARS
 - default: äöüabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890.-_@
 
@@ -89,14 +38,6 @@ List of characters allowed in a username.
 
 Space seperated list of supported [authentication mechanisms](http://wiki2.dovecot.org/Authentication/Mechanisms).
 
-## CERT_DOMAIN
-Name of the certificate domain.
-
-## SSL_DH_LENGTH
-- default: 2048
-
-Length of the Diffie-Helman key in bits.
-
 ## SSL_MIN_PROTOCOL
 - default: TLSv1.2
 
diff --git a/rootfs/etc/confd/templates/auth-oauth2.conf.ext.tmpl b/rootfs/etc/confd/templates/auth-oauth2.conf.ext.tmpl
index 14db780..9f52a5b 100644
--- a/rootfs/etc/confd/templates/auth-oauth2.conf.ext.tmpl
+++ b/rootfs/etc/confd/templates/auth-oauth2.conf.ext.tmpl
@@ -12,5 +12,5 @@ passdb {
 
 userdb {
   driver = static
-  args = uid=vmail gid=vmail home=/var/lib/vmail/mail/%d/%n
+  args = uid=vmail gid=vmail home=/var/lib/vmail/mail/%n
 }