From c147ac470071ce519ac9813ca878db05fb33419d Mon Sep 17 00:00:00 2001
From: Sebastian Hugentobler <sebastian@vanwa.ch>
Date: Mon, 23 Aug 2021 19:31:54 +0200
Subject: [PATCH] remove debuging config

---
 README.md                                     | 23 ++++++++++++++++++-
 rootfs/etc/confd/templates/10-auth.conf.tmpl  |  3 ---
 .../confd/templates/auth-oauth2.conf.ext.tmpl |  5 ----
 .../dovecot-oauth2.plain.conf.ext.tmpl        |  1 -
 .../dovecot-oauth2.token.conf.ext.tmpl        |  2 --
 5 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index a35e822..b546278 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[Dovecot](http://www.dovecot.org/) with imap, starttls, oauth2 and sieve rules.
+[Dovecot](http://www.dovecot.org/) with imap, starttls, oauth2 proxy auth and sieve rules.
 
 Uses [SSMTP](https://packages.debian.org/stable/mail/ssmtp) to send mails (for example if you have a redirect sieve rule).
 
@@ -9,6 +9,27 @@ Uses [SSMTP](https://packages.debian.org/stable/mail/ssmtp) to send mails (for e
 ## HOSTNAME
 Fully qualified name of the mail host.
 
+## GRANT_URL
+OAuth2 url for token grants (password grant type).
+
+## INTROSPECTION_URL
+OAuth2 url for token information.
+
+## USER_URL
+OAuth2 url for getting available users, the username will be appended to the end.
+
+## CLIENT_ID
+Id of the OAuth2 application.
+
+## CLIENT_SECRET
+Secret of the OAuth2 application.
+
+## OAUTH_ADMIN_USER
+User with which to perform user lookups (does not have to be an admin, but needs enough rights for that).
+
+## OAUTH_ADMIN_PASSWORD
+Password for the `OAUTH_ADMIN_USER`.
+
 ## SSMTP_MAIL_RELAY
 Hostname and port for the used smtp relay (for example `mail.example.com:587`).
 
diff --git a/rootfs/etc/confd/templates/10-auth.conf.tmpl b/rootfs/etc/confd/templates/10-auth.conf.tmpl
index 4d3580c..8559320 100644
--- a/rootfs/etc/confd/templates/10-auth.conf.tmpl
+++ b/rootfs/etc/confd/templates/10-auth.conf.tmpl
@@ -2,6 +2,3 @@ auth_username_chars = {{getenv "ALLOWED_USERNAME_CHARS" "äöüabcdefghijklmnopq
 auth_username_format = %n
 auth_mechanisms = {{getenv "AUTH_MECHANISMS" "plain login oauthbearer xoauth2"}}
 !include auth-oauth2.conf.ext
-auth_verbose = yes
-auth_debug = yes
-auth_debug_passwords = yes
diff --git a/rootfs/etc/confd/templates/auth-oauth2.conf.ext.tmpl b/rootfs/etc/confd/templates/auth-oauth2.conf.ext.tmpl
index 3885593..7d1a33a 100644
--- a/rootfs/etc/confd/templates/auth-oauth2.conf.ext.tmpl
+++ b/rootfs/etc/confd/templates/auth-oauth2.conf.ext.tmpl
@@ -10,11 +10,6 @@ passdb {
   args = /etc/dovecot/dovecot-oauth2.plain.conf.ext
 }
 
-#userdb {
-#  driver = static
-#  args = uid=vmail gid=vmail username_format=%n home=/var/lib/vmail/mail/%n
-#}
-
 userdb {
   driver = lua
   args = file=/etc/dovecot/oauth2-userdb.lua blocking=yes
diff --git a/rootfs/etc/confd/templates/dovecot-oauth2.plain.conf.ext.tmpl b/rootfs/etc/confd/templates/dovecot-oauth2.plain.conf.ext.tmpl
index 0097744..419a169 100644
--- a/rootfs/etc/confd/templates/dovecot-oauth2.plain.conf.ext.tmpl
+++ b/rootfs/etc/confd/templates/dovecot-oauth2.plain.conf.ext.tmpl
@@ -7,4 +7,3 @@ username_attribute = username
 tls_ca_cert_file = /etc/ssl/certs/ca-certificates.crt
 use_grant_password = yes
 pass_attrs = host=127.0.0.1 proxy=y proxy_mech=xoauth2 pass=%{oauth2:access_token}
-debug = yes
diff --git a/rootfs/etc/confd/templates/dovecot-oauth2.token.conf.ext.tmpl b/rootfs/etc/confd/templates/dovecot-oauth2.token.conf.ext.tmpl
index f6b5597..82a45ff 100644
--- a/rootfs/etc/confd/templates/dovecot-oauth2.token.conf.ext.tmpl
+++ b/rootfs/etc/confd/templates/dovecot-oauth2.token.conf.ext.tmpl
@@ -7,6 +7,4 @@ username_attribute = username
 tls_ca_cert_file = /etc/ssl/certs/ca-certificates.crt
 use_grant_password = no
 pass_attrs = pass=%{oauth2:access_token}
-debug = yes
-username_format = %n