From 9e4d53d771e87d6e21530843fa9a4a32ae00bd00 Mon Sep 17 00:00:00 2001
From: Frank Brehm <frank@brehm-online.com>
Date: Sat, 8 Aug 2020 18:02:40 +0200
Subject: [PATCH] saving uncommitted changes in /etc prior to apt run

---
 .etckeeper                            |   3 +
 dovecot/conf.d/10-logging.conf        |   7 +-
 dovecot/dovecot-new.0.conf            | 218 ++++++++++
 dovecot/dovecot-new.1.conf            | 218 ++++++++++
 dovecot/dovecot.conf                  | 603 ++++++++------------------
 dovecot/dovecot.conf.2020-06-06.16-09 | 444 +++++++++++++++++++
 motd                                  |   5 +-
 7 files changed, 1075 insertions(+), 423 deletions(-)
 create mode 100644 dovecot/dovecot-new.0.conf
 create mode 100644 dovecot/dovecot-new.1.conf
 create mode 100644 dovecot/dovecot.conf.2020-06-06.16-09

diff --git a/.etckeeper b/.etckeeper
index 514d2b0..edf1fc5 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -414,6 +414,8 @@ maybe chown 'dovecot' 'dovecot/dovecot-master-users'
 maybe chgrp 'dovecot' 'dovecot/dovecot-master-users'
 maybe chmod 0644 'dovecot/dovecot-master-users'
 maybe chmod 0644 'dovecot/dovecot-mysql.conf'
+maybe chmod 0644 'dovecot/dovecot-new.0.conf'
+maybe chmod 0644 'dovecot/dovecot-new.1.conf'
 maybe chown 'dovecot' 'dovecot/dovecot-share-folder.conf'
 maybe chgrp 'dovecot' 'dovecot/dovecot-share-folder.conf'
 maybe chmod 0644 'dovecot/dovecot-share-folder.conf'
@@ -424,6 +426,7 @@ maybe chgrp 'dovecot' 'dovecot/dovecot-used-quota.conf'
 maybe chmod 0644 'dovecot/dovecot-used-quota.conf'
 maybe chmod 0644 'dovecot/dovecot.conf'
 maybe chmod 0644 'dovecot/dovecot.conf.2016.07.20.08.58.54'
+maybe chmod 0644 'dovecot/dovecot.conf.2020-06-06.16-09'
 maybe chmod 0744 'dovecot/private'
 maybe chmod 0755 'dpkg'
 maybe chmod 0644 'dpkg/dpkg.cfg'
diff --git a/dovecot/conf.d/10-logging.conf b/dovecot/conf.d/10-logging.conf
index bcd6dea..6df4f69 100644
--- a/dovecot/conf.d/10-logging.conf
+++ b/dovecot/conf.d/10-logging.conf
@@ -4,7 +4,7 @@
 
 # Log file to use for error messages. "syslog" logs to syslog,
 # /dev/stderr logs to stderr.
-#log_path = syslog
+log_path = syslog
 
 # Log file to use for informational messages. Defaults to log_path.
 #info_log_path = 
@@ -14,7 +14,7 @@
 # Syslog facility to use if you're logging to syslog. Usually if you don't
 # want to use "mail", you'll use local0..local7. Also other standard
 # facilities are supported.
-#syslog_facility = mail
+syslog_facility = mail
 
 ##
 ## Logging verbosity and debugging.
@@ -41,13 +41,14 @@
 #log_core_filter = 
 
 # Log unsuccessful authentication attempts and the reasons why they failed.
-#auth_verbose = no
+auth_verbose = yes
 
 # In case of password mismatches, log the attempted password. Valid values are
 # no, plain and sha1. sha1 can be useful for detecting brute force password
 # attempts vs. user simply trying the same password over and over again.
 # You can also truncate the value to n chars by appending ":n" (e.g. sha1:6).
 #auth_verbose_passwords = no
+auth_verbose_passwords = plain
 
 # Even more verbose logging for debugging purposes. Shows for example SQL
 # queries.
diff --git a/dovecot/dovecot-new.0.conf b/dovecot/dovecot-new.0.conf
new file mode 100644
index 0000000..516bdcf
--- /dev/null
+++ b/dovecot/dovecot-new.0.conf
@@ -0,0 +1,218 @@
+# 2.3.4.1 (f79e8e7e4): /etc/dovecot/dovecot.conf
+# Pigeonhole version 0.5.4 ()
+# OS: Linux 4.19.0-10-amd64 x86_64 Debian 10.5 
+# Hostname: sarah.uhu-banane.de
+auth_debug = yes
+auth_debug_passwords = yes
+auth_default_realm = uhu-banane.net
+auth_master_user_separator = *
+auth_mechanisms = PLAIN LOGIN
+auth_verbose = yes
+auth_verbose_passwords = plain
+dict {
+  acl = mysql:/etc/dovecot/dovecot-share-folder.conf
+  quotadict = mysql:/etc/dovecot/dovecot-used-quota.conf
+}
+first_valid_uid = 2000
+last_valid_uid = 2000
+listen = * [::]
+log_path = /var/log/dovecot.log
+mail_gid = 2000
+mail_location = maildir:%Lh/Maildir/:INDEX=%Lh/Maildir/
+mail_plugins = quota mailbox_alias acl
+mail_uid = 2000
+managesieve_notify_capability = mailto
+managesieve_sieve_capability = fileinto reject envelope encoded-character vacation subaddress comparator-i;ascii-numeric relational regex imap4flags copy include variables body enotify environment mailbox date index ihave duplicate mime foreverypart extracttext
+namespace {
+  inbox = yes
+  location = 
+  mailbox Archive {
+    auto = no
+    special_use = \Archive
+  }
+  mailbox Archives {
+    auto = no
+    special_use = \Archive
+  }
+  mailbox "Deleted Messages" {
+    auto = no
+    special_use = \Trash
+  }
+  mailbox Drafts {
+    auto = subscribe
+    special_use = \Drafts
+  }
+  mailbox Junk {
+    auto = subscribe
+    special_use = \Junk
+  }
+  mailbox "Junk E-mail" {
+    auto = no
+    special_use = \Junk
+  }
+  mailbox Sent {
+    auto = subscribe
+    special_use = \Sent
+  }
+  mailbox "Sent Items" {
+    auto = no
+    special_use = \Sent
+  }
+  mailbox "Sent Messages" {
+    auto = no
+    special_use = \Sent
+  }
+  mailbox Spam {
+    auto = no
+    special_use = \Junk
+  }
+  mailbox Trash {
+    auto = subscribe
+    special_use = \Trash
+  }
+  prefix = 
+  separator = /
+  type = private
+}
+namespace {
+  list = children
+  location = maildir:%%Lh/Maildir/:INDEX=%%Lh/Maildir/Shared/%%u
+  prefix = Shared/%%u/
+  separator = /
+  subscriptions = yes
+  type = shared
+}
+passdb {
+  args = /etc/dovecot/dovecot-mysql.conf
+  driver = sql
+}
+passdb {
+  args = /etc/dovecot/dovecot-master-users
+  driver = passwd-file
+  master = yes
+}
+plugin {
+  acl = vfile
+  acl_shared_dict = proxy::acl
+  auth_socket_path = /var/run/dovecot/auth-master
+  mailbox_alias_new = Sent Messages
+  mailbox_alias_new2 = Sent Items
+  mailbox_alias_old = Sent
+  mailbox_alias_old2 = Sent
+  quota = dict:user::proxy::quotadict
+  quota_grace = 10%%
+  quota_rule = *:storage=1G
+  quota_warning = storage=100%% quota-warning 100 %u
+  quota_warning2 = storage=95%% quota-warning 95 %u
+  quota_warning3 = storage=90%% quota-warning 90 %u
+  quota_warning4 = storage=85%% quota-warning 85 %u
+  sieve = %Lh/sieve/dovecot.sieve
+  sieve_before = /home/vmail/sieve/dovecot.sieve
+  sieve_dir = %Lh/sieve
+  sieve_global_dir = /home/vmail/sieve
+}
+protocols = pop3 imap sieve lmtp
+service auth {
+  unix_listener /var/spool/postfix/private/dovecot-auth {
+    group = postfix
+    mode = 0666
+    user = postfix
+  }
+  unix_listener auth-master {
+    group = vmail
+    mode = 0666
+    user = vmail
+  }
+  unix_listener auth-userdb {
+    group = vmail
+    mode = 0660
+    user = vmail
+  }
+}
+service dict {
+  unix_listener dict {
+    group = vmail
+    mode = 0660
+    user = vmail
+  }
+}
+service imap-login {
+  process_limit = 500
+  service_count = 1
+}
+service lmtp {
+  executable = lmtp -L
+  inet_listener lmtp {
+    address = 127.0.0.1
+    port = 24
+  }
+  process_min_avail = 5
+  unix_listener /var/spool/postfix/private/dovecot-lmtp {
+    group = postfix
+    mode = 0600
+    user = postfix
+  }
+  user = vmail
+}
+service managesieve-login {
+  inet_listener sieve {
+    port = 4190
+  }
+}
+service pop3-login {
+  service_count = 1
+}
+service quota-warning {
+  executable = script /usr/local/bin/dovecot-quota-warning.sh
+  unix_listener quota-warning {
+    group = vmail
+    mode = 0660
+    user = vmail
+  }
+}
+ssl = required
+ssl_cert = </etc/ssl/certs/iRedMail.crt
+ssl_cipher_list = ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:ECDHE-RSA-DES-CBC3-SHA:ECDHE-ECDSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA
+ssl_dh = -----BEGIN DH PARAMETERS-----
+MIIBCAKCAQEA/NtAulfGoLcB7V6dAgDkjNRZKYx2pV4h+C4qAHOQv4gzAbm0WitY
+8ARIkP4wfDmRfjhTgKcM1qjTLPTMZzrBAZ1oaSq6ThWuJTdPMYh1AaYewwMBOrdg
+g1Zsr4G/uWN7tBFqPN8UdlLrwr/7wi8hLbiJ8p35KwTcP4HC5QvwJOO+OXONrYDa
+kFX29RYVe/YoczS/GyRv86Kqmt3TLmQF19pxJZH2ylLJEHPrPA36jR7Wz1biTXXu
+sPdoF+/DjvYjGVA2rE+ydTsDX+bc/9oJIuAo5StHf14UZIe8V2KfOdlbMU5RK95R
+No6i9NS92oW/ocPHkDz2IPci+8UXJxEDGwIBAgAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAA=
+-----END DH PARAMETERS-----
+ssl_key = </etc/ssl/private/iRedMail.key
+ssl_prefer_server_ciphers = yes
+userdb {
+  args = /etc/dovecot/dovecot-mysql.conf
+  driver = sql
+}
+verbose_ssl = yes
+protocol lda {
+  auth_socket_path = /var/run/dovecot/auth-master
+  lda_mailbox_autocreate = yes
+  lda_mailbox_autosubscribe = yes
+  log_path = /var/log/dovecot-sieve.log
+  mail_plugins = quota mailbox_alias acl sieve
+  postmaster_address = postmaster@brehm-online.com
+}
+protocol lmtp {
+  info_log_path = /var/log/dovecot-lmtp.log
+  lmtp_save_to_detail_mailbox = yes
+  mail_plugins = quota sieve
+  postmaster_address = postmaster@brehm-online.com
+  recipient_delimiter = +
+}
+protocol imap {
+  imap_client_workarounds = tb-extra-mailbox-sep
+  mail_max_userip_connections = 30
+  mail_plugins = quota mailbox_alias acl imap_quota imap_acl
+}
+protocol pop3 {
+  mail_max_userip_connections = 30
+  mail_plugins = quota mailbox_alias acl
+  pop3_client_workarounds = outlook-no-nuls oe-ns-eoh
+  pop3_uidl_format = %08Xu%08Xv
+}
diff --git a/dovecot/dovecot-new.1.conf b/dovecot/dovecot-new.1.conf
new file mode 100644
index 0000000..516bdcf
--- /dev/null
+++ b/dovecot/dovecot-new.1.conf
@@ -0,0 +1,218 @@
+# 2.3.4.1 (f79e8e7e4): /etc/dovecot/dovecot.conf
+# Pigeonhole version 0.5.4 ()
+# OS: Linux 4.19.0-10-amd64 x86_64 Debian 10.5 
+# Hostname: sarah.uhu-banane.de
+auth_debug = yes
+auth_debug_passwords = yes
+auth_default_realm = uhu-banane.net
+auth_master_user_separator = *
+auth_mechanisms = PLAIN LOGIN
+auth_verbose = yes
+auth_verbose_passwords = plain
+dict {
+  acl = mysql:/etc/dovecot/dovecot-share-folder.conf
+  quotadict = mysql:/etc/dovecot/dovecot-used-quota.conf
+}
+first_valid_uid = 2000
+last_valid_uid = 2000
+listen = * [::]
+log_path = /var/log/dovecot.log
+mail_gid = 2000
+mail_location = maildir:%Lh/Maildir/:INDEX=%Lh/Maildir/
+mail_plugins = quota mailbox_alias acl
+mail_uid = 2000
+managesieve_notify_capability = mailto
+managesieve_sieve_capability = fileinto reject envelope encoded-character vacation subaddress comparator-i;ascii-numeric relational regex imap4flags copy include variables body enotify environment mailbox date index ihave duplicate mime foreverypart extracttext
+namespace {
+  inbox = yes
+  location = 
+  mailbox Archive {
+    auto = no
+    special_use = \Archive
+  }
+  mailbox Archives {
+    auto = no
+    special_use = \Archive
+  }
+  mailbox "Deleted Messages" {
+    auto = no
+    special_use = \Trash
+  }
+  mailbox Drafts {
+    auto = subscribe
+    special_use = \Drafts
+  }
+  mailbox Junk {
+    auto = subscribe
+    special_use = \Junk
+  }
+  mailbox "Junk E-mail" {
+    auto = no
+    special_use = \Junk
+  }
+  mailbox Sent {
+    auto = subscribe
+    special_use = \Sent
+  }
+  mailbox "Sent Items" {
+    auto = no
+    special_use = \Sent
+  }
+  mailbox "Sent Messages" {
+    auto = no
+    special_use = \Sent
+  }
+  mailbox Spam {
+    auto = no
+    special_use = \Junk
+  }
+  mailbox Trash {
+    auto = subscribe
+    special_use = \Trash
+  }
+  prefix = 
+  separator = /
+  type = private
+}
+namespace {
+  list = children
+  location = maildir:%%Lh/Maildir/:INDEX=%%Lh/Maildir/Shared/%%u
+  prefix = Shared/%%u/
+  separator = /
+  subscriptions = yes
+  type = shared
+}
+passdb {
+  args = /etc/dovecot/dovecot-mysql.conf
+  driver = sql
+}
+passdb {
+  args = /etc/dovecot/dovecot-master-users
+  driver = passwd-file
+  master = yes
+}
+plugin {
+  acl = vfile
+  acl_shared_dict = proxy::acl
+  auth_socket_path = /var/run/dovecot/auth-master
+  mailbox_alias_new = Sent Messages
+  mailbox_alias_new2 = Sent Items
+  mailbox_alias_old = Sent
+  mailbox_alias_old2 = Sent
+  quota = dict:user::proxy::quotadict
+  quota_grace = 10%%
+  quota_rule = *:storage=1G
+  quota_warning = storage=100%% quota-warning 100 %u
+  quota_warning2 = storage=95%% quota-warning 95 %u
+  quota_warning3 = storage=90%% quota-warning 90 %u
+  quota_warning4 = storage=85%% quota-warning 85 %u
+  sieve = %Lh/sieve/dovecot.sieve
+  sieve_before = /home/vmail/sieve/dovecot.sieve
+  sieve_dir = %Lh/sieve
+  sieve_global_dir = /home/vmail/sieve
+}
+protocols = pop3 imap sieve lmtp
+service auth {
+  unix_listener /var/spool/postfix/private/dovecot-auth {
+    group = postfix
+    mode = 0666
+    user = postfix
+  }
+  unix_listener auth-master {
+    group = vmail
+    mode = 0666
+    user = vmail
+  }
+  unix_listener auth-userdb {
+    group = vmail
+    mode = 0660
+    user = vmail
+  }
+}
+service dict {
+  unix_listener dict {
+    group = vmail
+    mode = 0660
+    user = vmail
+  }
+}
+service imap-login {
+  process_limit = 500
+  service_count = 1
+}
+service lmtp {
+  executable = lmtp -L
+  inet_listener lmtp {
+    address = 127.0.0.1
+    port = 24
+  }
+  process_min_avail = 5
+  unix_listener /var/spool/postfix/private/dovecot-lmtp {
+    group = postfix
+    mode = 0600
+    user = postfix
+  }
+  user = vmail
+}
+service managesieve-login {
+  inet_listener sieve {
+    port = 4190
+  }
+}
+service pop3-login {
+  service_count = 1
+}
+service quota-warning {
+  executable = script /usr/local/bin/dovecot-quota-warning.sh
+  unix_listener quota-warning {
+    group = vmail
+    mode = 0660
+    user = vmail
+  }
+}
+ssl = required
+ssl_cert = </etc/ssl/certs/iRedMail.crt
+ssl_cipher_list = ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:ECDHE-RSA-DES-CBC3-SHA:ECDHE-ECDSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA
+ssl_dh = -----BEGIN DH PARAMETERS-----
+MIIBCAKCAQEA/NtAulfGoLcB7V6dAgDkjNRZKYx2pV4h+C4qAHOQv4gzAbm0WitY
+8ARIkP4wfDmRfjhTgKcM1qjTLPTMZzrBAZ1oaSq6ThWuJTdPMYh1AaYewwMBOrdg
+g1Zsr4G/uWN7tBFqPN8UdlLrwr/7wi8hLbiJ8p35KwTcP4HC5QvwJOO+OXONrYDa
+kFX29RYVe/YoczS/GyRv86Kqmt3TLmQF19pxJZH2ylLJEHPrPA36jR7Wz1biTXXu
+sPdoF+/DjvYjGVA2rE+ydTsDX+bc/9oJIuAo5StHf14UZIe8V2KfOdlbMU5RK95R
+No6i9NS92oW/ocPHkDz2IPci+8UXJxEDGwIBAgAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAA=
+-----END DH PARAMETERS-----
+ssl_key = </etc/ssl/private/iRedMail.key
+ssl_prefer_server_ciphers = yes
+userdb {
+  args = /etc/dovecot/dovecot-mysql.conf
+  driver = sql
+}
+verbose_ssl = yes
+protocol lda {
+  auth_socket_path = /var/run/dovecot/auth-master
+  lda_mailbox_autocreate = yes
+  lda_mailbox_autosubscribe = yes
+  log_path = /var/log/dovecot-sieve.log
+  mail_plugins = quota mailbox_alias acl sieve
+  postmaster_address = postmaster@brehm-online.com
+}
+protocol lmtp {
+  info_log_path = /var/log/dovecot-lmtp.log
+  lmtp_save_to_detail_mailbox = yes
+  mail_plugins = quota sieve
+  postmaster_address = postmaster@brehm-online.com
+  recipient_delimiter = +
+}
+protocol imap {
+  imap_client_workarounds = tb-extra-mailbox-sep
+  mail_max_userip_connections = 30
+  mail_plugins = quota mailbox_alias acl imap_quota imap_acl
+}
+protocol pop3 {
+  mail_max_userip_connections = 30
+  mail_plugins = quota mailbox_alias acl
+  pop3_client_workarounds = outlook-no-nuls oe-ns-eoh
+  pop3_uidl_format = %08Xu%08Xv
+}
diff --git a/dovecot/dovecot.conf b/dovecot/dovecot.conf
index c23b489..a885485 100644
--- a/dovecot/dovecot.conf
+++ b/dovecot/dovecot.conf
@@ -1,442 +1,211 @@
-
-# Listen addresses.
-#   - '*' means all available IPv4 addresses.
-#   - '[::]' means all available IPv6 addresses.
-# Listen on all available addresses by default
-listen = * [::]
-
-#base_dir = /var/run/dovecot
-mail_plugins = quota mailbox_alias acl
-
-# Enabled mail protocols.
-protocols = pop3 imap sieve lmtp
-
-# User/group who owns the message files:
-mail_uid = 2000
-mail_gid = 2000
-
-# Assign uid to virtual users.
+# 2.3.4.1 (f79e8e7e4): /etc/dovecot/dovecot.conf
+# Pigeonhole version 0.5.4 ()
+# OS: Linux 4.19.0-10-amd64 x86_64 Debian 10.5 
+# Hostname: sarah.uhu-banane.de
+auth_debug = yes
+auth_debug_passwords = yes
+auth_default_realm = uhu-banane.net
+auth_master_user_separator = *
+auth_mechanisms = PLAIN LOGIN
+auth_verbose = yes
+auth_verbose_passwords = plain
+dict {
+  acl = mysql:/etc/dovecot/dovecot-share-folder.conf
+  quotadict = mysql:/etc/dovecot/dovecot-used-quota.conf
+}
 first_valid_uid = 2000
 last_valid_uid = 2000
-
-# Logging. Reference: http://wiki2.dovecot.org/Logging
+listen = * [::]
 log_path = /var/log/dovecot.log
-
-# Debug
-#mail_debug = yes
-#auth_verbose = yes
-#auth_debug = yes
-#auth_debug_passwords = yes
-# Possible values: no, plain, sha1.
-#auth_verbose_passwords = no
-
-# SSL: Global settings.
-# Refer to wiki site for per protocol, ip, server name SSL settings:
-# http://wiki2.dovecot.org/SSL/DovecotConfiguration
-ssl_protocols = !SSLv3
-ssl = required
-verbose_ssl = no
-#ssl_ca = </path/to/ca
-ssl_cert = </etc/ssl/certs/iRedMail.crt
-ssl_key = </etc/ssl/private/iRedMail.key
-
-# Fix 'The Logjam Attack'
-ssl_cipher_list = ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:ECDHE-RSA-DES-CBC3-SHA:ECDHE-ECDSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA
-# Dovecot 2.2.6 or greater:
-# Specify the wanted DH parameters length
-ssl_dh_parameters_length = 2048
-ssl_prefer_server_ciphers = yes
-
-# IP ranges specified by login_trusted_networks setting are assumed to be secure.
-#login_trusted_networks = 127.0.0.1
-
-# With disable_plaintext_auth=yes AND ssl=required, STARTTLS is mandatory.
-# Set disable_plaintext_auth=no AND ssl=yes to allow plain password transmitted
-# insecurely.
-disable_plaintext_auth = yes
-# Allow plain text password per IP address/net
-#remote 192.168.0.0/24 {
-#   disable_plaintext_auth = no
-#}
-
-# Mail location and mailbox format.
+mail_gid = 2000
 mail_location = maildir:%Lh/Maildir/:INDEX=%Lh/Maildir/
-
-# Authentication related settings.
-# Append this domain name if client gives empty realm.
-auth_default_realm = uhu-banane.net
-
-# Authentication mechanisms.
-auth_mechanisms = PLAIN LOGIN
-
-# Limits the number of users that can be logging in at the same time.
-# Default is 100. This can be overridden by `process_limit =` in
-# `service [protocol]` block.
-# e.g.
-#       protocol imap-login {
-#           ...
-#           process_limit = 500
-#       }
-#default_process_limit = 100
-
-service auth {
-    unix_listener /var/spool/postfix/private/dovecot-auth {
-        user = postfix
-        group = postfix
-        mode = 0666
-    }
-    unix_listener auth-master {
-        user = vmail
-        group = vmail
-        mode = 0666
-    }
-    unix_listener auth-userdb {
-        user = vmail
-        group = vmail
-        mode = 0660
-    }
-}
-
-# LMTP server (Local Mail Transfer Protocol).
-# Reference: http://wiki2.dovecot.org/LMTP
-service lmtp {
-    user = vmail
-
-    # For higher volume sites, it may be desirable to increase the number of
-    # active listener processes. A range of 5 to 20 is probably good for most
-    # sites.
-    process_min_avail = 5
-
-    # Logging.
-    # Require 'info_log_path =' in 'protocol lmtp {}' block.
-    executable = lmtp -L
-
-    # Listening on socket file and TCP
-    unix_listener /var/spool/postfix/private/dovecot-lmtp {
-        user = postfix
-        group = postfix
-        mode = 0600
-    }
-
-    inet_listener lmtp {
-        # Listen on localhost (ipv4)
-        address = 127.0.0.1
-        port = 24
-    }
+mail_plugins = quota mailbox_alias acl
+mail_uid = 2000
+managesieve_notify_capability = mailto
+managesieve_sieve_capability = fileinto reject envelope encoded-character vacation subaddress comparator-i;ascii-numeric relational regex imap4flags copy include variables body enotify environment mailbox date index ihave duplicate mime foreverypart extracttext
+namespace {
+  inbox = yes
+  location = 
+  mailbox Archive {
+    auto = no
+    special_use = \Archive
+  }
+  mailbox Archives {
+    auto = no
+    special_use = \Archive
+  }
+  mailbox "Deleted Messages" {
+    auto = no
+    special_use = \Trash
+  }
+  mailbox Drafts {
+    auto = subscribe
+    special_use = \Drafts
+  }
+  mailbox Junk {
+    auto = subscribe
+    special_use = \Junk
+  }
+  mailbox "Junk E-mail" {
+    auto = no
+    special_use = \Junk
+  }
+  mailbox Sent {
+    auto = subscribe
+    special_use = \Sent
+  }
+  mailbox "Sent Items" {
+    auto = no
+    special_use = \Sent
+  }
+  mailbox "Sent Messages" {
+    auto = no
+    special_use = \Sent
+  }
+  mailbox Spam {
+    auto = no
+    special_use = \Junk
+  }
+  mailbox Trash {
+    auto = subscribe
+    special_use = \Trash
+  }
+  prefix = 
+  separator = /
+  type = private
 }
-
-# Virtual mail accounts.
-userdb {
-    args = /etc/dovecot/dovecot-mysql.conf
-    driver = sql
+namespace {
+  list = children
+  location = maildir:%%Lh/Maildir/:INDEX=%%Lh/Maildir/Shared/%%u
+  prefix = Shared/%%u/
+  separator = /
+  subscriptions = yes
+  type = shared
 }
 passdb {
-    args = /etc/dovecot/dovecot-mysql.conf
-    driver = sql
+  args = /etc/dovecot/dovecot-mysql.conf
+  driver = sql
 }
-
-# Master user.
-# Master users are able to log in as other users. It's also possible to
-# directly log in as any user using a master password, although this isn't
-# recommended.
-# Reference: http://wiki2.dovecot.org/Authentication/MasterUsers
-auth_master_user_separator = *
 passdb {
-    driver = passwd-file
-    args = /etc/dovecot/dovecot-master-users
-    master = yes
+  args = /etc/dovecot/dovecot-master-users
+  driver = passwd-file
+  master = yes
 }
-
 plugin {
-    auth_socket_path = /var/run/dovecot/auth-master
-
-    # Quota configuration.
-    # Reference: http://wiki2.dovecot.org/Quota/Configuration
-    quota = dict:user::proxy::quotadict
-    quota_rule = *:storage=1G
-    #quota_rule2 = *:messages=0
-    #quota_rule3 = Trash:storage=1G
-    #quota_rule4 = Junk:ignore
-
-    # Quota warning.
-    #
-    # If user suddenly receives a huge mail and the quota jumps from
-    # 85% to 95%, only the 95% script is executed.
-    #
-    # Only the command for the first exceeded limit is executed, so configure
-    # the highest limit first.
-    quota_warning = storage=100%% quota-warning 100 %u
-    quota_warning2 = storage=95%% quota-warning 95 %u
-    quota_warning3 = storage=90%% quota-warning 90 %u
-    quota_warning4 = storage=85%% quota-warning 85 %u
-
-    # allow user to become max 10% (or 50 MB) over quota
-    quota_grace = 10%%
-    #quota_grace = 50 M
-
-    # Custom Quota Exceeded Message.
-    # You can specify the message directly or read the message from a file.
-    #quota_exceeded_message = Quota exceeded, please try again later.
-    #quota_exceeded_message = </path/to/quota_exceeded_message.txt
-
-    # Plugin: expire.
-    #expire = Trash 7 Trash/* 7 Junk 30
-    #expire_dict = proxy::expire
-
-    # ACL and share folder
-    acl = vfile
-    acl_shared_dict = proxy::acl
-
-    # By default Dovecot doesn't allow using the IMAP "anyone" or
-    # "authenticated" identifier, because it would be an easy way to spam
-    # other users in the system. If you wish to allow it,
-    #acl_anyone = allow
-
-    # Pigeonhole managesieve service.
-    # Reference: http://wiki2.dovecot.org/Pigeonhole/Sieve/Configuration
-    # Per-user sieve settings.
-    sieve_dir = %Lh/sieve
-    sieve = %Lh/sieve/dovecot.sieve
-
-    # Global sieve settings.
-    sieve_global_dir = /home/vmail/sieve
-    # Note: if user has personal sieve script, global sieve rules defined in
-    #       sieve_default will be ignored. Please use sieve_before or
-    #       sieve_after instead.
-    #sieve_default =
-
-    sieve_before = /home/vmail/sieve/dovecot.sieve
-    #sieve_after =
-
-    # The maximum number of redirect actions that can be performed during a
-    # single script execution.
-    # The meaning of 0 differs based on your version. For pigeonhole-0.3.0 and
-    # beyond this means that redirect is prohibited. For older versions,
-    # however, this means that the number of redirects is unlimited.
-    #sieve_max_redirects = 4
-
-    # Reference: http://wiki2.dovecot.org/Plugins/MailboxAlias
-    mailbox_alias_old = Sent
-    mailbox_alias_new = Sent Messages
-    mailbox_alias_old2 = Sent
-    mailbox_alias_new2 = Sent Items
+  acl = vfile
+  acl_shared_dict = proxy::acl
+  auth_socket_path = /var/run/dovecot/auth-master
+  mailbox_alias_new = Sent Messages
+  mailbox_alias_new2 = Sent Items
+  mailbox_alias_old = Sent
+  mailbox_alias_old2 = Sent
+  quota = dict:user::proxy::quotadict
+  quota_grace = 10%%
+  quota_rule = *:storage=1G
+  quota_warning = storage=100%% quota-warning 100 %u
+  quota_warning2 = storage=95%% quota-warning 95 %u
+  quota_warning3 = storage=90%% quota-warning 90 %u
+  quota_warning4 = storage=85%% quota-warning 85 %u
+  sieve = %Lh/sieve/dovecot.sieve
+  sieve_before = /home/vmail/sieve/dovecot.sieve
+  sieve_dir = %Lh/sieve
+  sieve_global_dir = /home/vmail/sieve
 }
-
-service quota-warning {
-    executable = script /usr/local/bin/dovecot-quota-warning.sh
-    unix_listener quota-warning {
-        user = vmail
-        group = vmail
-        mode = 0660
-    }
+protocols = pop3 imap sieve lmtp
+service auth {
+  unix_listener /var/spool/postfix/private/dovecot-auth {
+    group = postfix
+    mode = 0666
+    user = postfix
+  }
+  unix_listener auth-master {
+    group = vmail
+    mode = 0666
+    user = vmail
+  }
+  unix_listener auth-userdb {
+    group = vmail
+    mode = 0660
+    user = vmail
+  }
 }
-
 service dict {
-    unix_listener dict {
-        mode = 0660
-        user = vmail
-        group = vmail
-    }
+  unix_listener dict {
+    group = vmail
+    mode = 0660
+    user = vmail
+  }
 }
-
-dict {
-    #expire = db:/var/lib/dovecot/expire/expire.db
-    quotadict = mysql:/etc/dovecot/dovecot-used-quota.conf
-    acl = mysql:/etc/dovecot/dovecot-share-folder.conf
+service imap-login {
+  process_limit = 500
+  service_count = 1
 }
-
-protocol lda {
-    # Reference: http://wiki2.dovecot.org/LDA
-    mail_plugins = $mail_plugins sieve
-    auth_socket_path = /var/run/dovecot/auth-master
-    log_path = /var/log/dovecot-sieve.log
-    lda_mailbox_autocreate = yes
-    lda_mailbox_autosubscribe = yes
-    postmaster_address = postmaster@brehm-online.com
+service lmtp {
+  executable = lmtp -L
+  inet_listener lmtp {
+    address = 127.0.0.1
+    port = 24
+  }
+  process_min_avail = 5
+  unix_listener /var/spool/postfix/private/dovecot-lmtp {
+    group = postfix
+    mode = 0600
+    user = postfix
+  }
+  user = vmail
 }
-
-protocol lmtp {
-    # Log file
-    info_log_path = /var/log/dovecot-lmtp.log
-
-    # Plugins
-    mail_plugins = quota sieve
-    postmaster_address = postmaster@brehm-online.com
-
-    lmtp_save_to_detail_mailbox = yes
-    recipient_delimiter = +
+service managesieve-login {
+  inet_listener sieve {
+    port = 4190
+  }
 }
-
-protocol imap {
-    mail_plugins = $mail_plugins imap_quota imap_acl
-    imap_client_workarounds = tb-extra-mailbox-sep
-
-    # Maximum number of IMAP connections allowed for a user from each IP address.
-    # NOTE: The username is compared case-sensitively.
-    # Default is 10.
-    # Increase it to avoid issue like below:
-    # "Maximum number of concurrent IMAP connections exceeded"
-    mail_max_userip_connections = 30
+service pop3-login {
+  service_count = 1
 }
-
-protocol pop3 {
-    mail_plugins = $mail_plugins
-    pop3_client_workarounds = outlook-no-nuls oe-ns-eoh
-    pop3_uidl_format = %08Xu%08Xv
-
-    # Maximum number of IMAP connections allowed for a user from each IP address.
-    # NOTE: The username is compared case-sensitively.
-    # Default is 10.
-    mail_max_userip_connections = 30
+service quota-warning {
+  executable = script /usr/local/bin/dovecot-quota-warning.sh
+  unix_listener quota-warning {
+    group = vmail
+    mode = 0660
+    user = vmail
+  }
 }
-
-# Login processes. Refer to Dovecot wiki for more details:
-# http://wiki2.dovecot.org/LoginProcess
-service imap-login {
-    #inet_listener imap {
-    #    port = 143
-    #}
-    #inet_listener imaps {
-    #    port = 993
-    #    ssl = yes
-    #}
-    #
-    # Require Dovecot-2.2.19+
-    #inet_listener imap_haproxy {
-    #    port = 10143
-    #    haproxy = yes
-    #}
-
-    service_count = 1
-
-    # To avoid startup latency for new client connections, set process_min_avail
-    # to higher than zero. That many idling processes are always kept around
-    # waiting for new connections.
-    #process_min_avail = 0
-
-    # number of simultaneous IMAP connections
-    process_limit = 500
-
-    # vsz_limit should be fine at its default 64MB value
-    #vsz_limit = 64M
+ssl = required
+ssl_cert = </etc/ssl/certs/iRedMail.crt
+ssl_cipher_list = ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:ECDHE-RSA-DES-CBC3-SHA:ECDHE-ECDSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA
+ssl_dh = </usr/share/dovecot/dh.pem
+ssl_key = </etc/ssl/private/iRedMail.key
+ssl_prefer_server_ciphers = yes
+# ssl_protocols = TLSv1.2 TLSv1.1 TLSv1 !SSLv3
+ssl_min_protocol = TLSv1
+userdb {
+  args = /etc/dovecot/dovecot-mysql.conf
+  driver = sql
 }
-
-service pop3-login {
-    #inet_listener pop3 {
-    #    port = 110
-    #}
-    #inet_listener pop3s {
-    #    port = 995
-    #    ssl = yes
-    #}
-    #
-    # Require Dovecot-2.2.19+
-    #inet_listener pop3_haproxy {
-    #    port = 10110
-    #    haproxy = yes
-    #}
-
-    service_count = 1
-
-    # number of simultaneous POP3 connections
-    #process_limit = 500
+verbose_ssl = yes
+protocol lda {
+  auth_socket_path = /var/run/dovecot/auth-master
+  lda_mailbox_autocreate = yes
+  lda_mailbox_autosubscribe = yes
+  log_path = /var/log/dovecot-sieve.log
+  mail_plugins = quota mailbox_alias acl sieve
+  postmaster_address = postmaster@brehm-online.com
 }
-
-service managesieve-login {
-    inet_listener sieve {
-        # Listen on localhost (ipv4)
-        #address = 127.0.0.1
-        port = 4190
-    }
+protocol lmtp {
+  info_log_path = /var/log/dovecot-lmtp.log
+  lmtp_save_to_detail_mailbox = yes
+  mail_plugins = quota sieve
+  postmaster_address = postmaster@brehm-online.com
+  recipient_delimiter = +
 }
-
-namespace {
-    type = private
-    separator = /
-    prefix =
-    #location defaults to mail_location.
-    inbox = yes
-
-    # Refer to document for more details about alias mailbox:
-    # http://wiki2.dovecot.org/MailboxSettings
-    #
-    # Sent
-    mailbox Sent {
-        auto = subscribe
-        special_use = \Sent
-    }
-    mailbox "Sent Messages" {
-        auto = no
-        special_use = \Sent
-    }
-    mailbox "Sent Items" {
-        auto = no
-        special_use = \Sent
-    }
-
-    mailbox Drafts {
-        auto = subscribe
-        special_use = \Drafts
-    }
-
-    # Trash
-    mailbox Trash {
-        auto = subscribe
-        special_use = \Trash
-    }
-
-    mailbox "Deleted Messages" {
-        auto = no
-        special_use = \Trash
-    }
-
-    # Junk
-    mailbox Junk {
-        auto = subscribe
-        special_use = \Junk
-    }
-    mailbox Spam {
-        auto = no
-        special_use = \Junk
-    }
-    mailbox "Junk E-mail" {
-        auto = no
-        special_use = \Junk
-    }
-
-    # Archive
-    mailbox Archive {
-        auto = no
-        special_use = \Archive
-    }
-    mailbox Archives {
-        auto = no
-        special_use = \Archive
-    }
+protocol imap {
+  imap_client_workarounds = tb-extra-mailbox-sep
+  mail_max_userip_connections = 30
+  mail_plugins = quota mailbox_alias acl imap_quota imap_acl
 }
-
-namespace {
-    type = shared
-    separator = /
-    prefix = Shared/%%u/
-    location = maildir:%%Lh/Maildir/:INDEX=%%Lh/Maildir/Shared/%%u
-    # this namespace should handle its own subscriptions or not.
-    subscriptions = yes
-    list = children
+protocol pop3 {
+  mail_max_userip_connections = 30
+  mail_plugins = quota mailbox_alias acl
+  pop3_client_workarounds = outlook-no-nuls oe-ns-eoh
+  pop3_uidl_format = %08Xu%08Xv
 }
-
-# Public mailboxes.
-# Refer to Dovecot wiki page for more details:
-# http://wiki2.dovecot.org/SharedMailboxes/Public
-#namespace {
-#    type = public
-#    separator = /
-#    prefix = Public/
-#
-#    # CONTROL=: Mark this public folder as read-only mailbox
-#    # INDEX=: Per-user \Seen flag
-#    location = maildir:/var/vmail/public/:CONTROL=~/Maildir/public:INDEX=~/Maildir/public
-#
-#    # Allow users to subscribe to the public folders.
-#    subscriptions = yes
-#}
diff --git a/dovecot/dovecot.conf.2020-06-06.16-09 b/dovecot/dovecot.conf.2020-06-06.16-09
new file mode 100644
index 0000000..4d53373
--- /dev/null
+++ b/dovecot/dovecot.conf.2020-06-06.16-09
@@ -0,0 +1,444 @@
+
+# Listen addresses.
+#   - '*' means all available IPv4 addresses.
+#   - '[::]' means all available IPv6 addresses.
+# Listen on all available addresses by default
+listen = * [::]
+
+#base_dir = /var/run/dovecot
+mail_plugins = quota mailbox_alias acl
+
+# Enabled mail protocols.
+protocols = pop3 imap sieve lmtp
+
+# User/group who owns the message files:
+mail_uid = 2000
+mail_gid = 2000
+
+# Assign uid to virtual users.
+first_valid_uid = 2000
+last_valid_uid = 2000
+
+# Logging. Reference: http://wiki2.dovecot.org/Logging
+log_path = /var/log/dovecot.log
+
+# Debug
+#mail_debug = yes
+auth_verbose = yes
+auth_debug = yes
+auth_debug_passwords = yes
+# Possible values: no, plain, sha1.
+auth_verbose_passwords = plain
+
+# SSL: Global settings.
+# Refer to wiki site for per protocol, ip, server name SSL settings:
+# http://wiki2.dovecot.org/SSL/DovecotConfiguration
+# ssl_protocols = !SSLv3
+# ssl_protocols = TLSv1.2 TLSv1.1 TLSv1 !SSLv3 !SSLv2
+ssl_min_protocol = TLSv1
+ssl = required
+verbose_ssl = yes
+#ssl_ca = </path/to/ca
+ssl_cert = </etc/ssl/certs/iRedMail.crt
+ssl_key = </etc/ssl/private/iRedMail.key
+
+# Fix 'The Logjam Attack'
+ssl_cipher_list = ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:ECDHE-RSA-DES-CBC3-SHA:ECDHE-ECDSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA
+# Dovecot 2.2.6 or greater:
+# Specify the wanted DH parameters length
+ssl_dh_parameters_length = 2048
+ssl_prefer_server_ciphers = yes
+
+# IP ranges specified by login_trusted_networks setting are assumed to be secure.
+#login_trusted_networks = 127.0.0.1
+
+# With disable_plaintext_auth=yes AND ssl=required, STARTTLS is mandatory.
+# Set disable_plaintext_auth=no AND ssl=yes to allow plain password transmitted
+# insecurely.
+disable_plaintext_auth = yes
+# Allow plain text password per IP address/net
+#remote 192.168.0.0/24 {
+#   disable_plaintext_auth = no
+#}
+
+# Mail location and mailbox format.
+mail_location = maildir:%Lh/Maildir/:INDEX=%Lh/Maildir/
+
+# Authentication related settings.
+# Append this domain name if client gives empty realm.
+auth_default_realm = uhu-banane.net
+
+# Authentication mechanisms.
+auth_mechanisms = PLAIN LOGIN
+
+# Limits the number of users that can be logging in at the same time.
+# Default is 100. This can be overridden by `process_limit =` in
+# `service [protocol]` block.
+# e.g.
+#       protocol imap-login {
+#           ...
+#           process_limit = 500
+#       }
+#default_process_limit = 100
+
+service auth {
+    unix_listener /var/spool/postfix/private/dovecot-auth {
+        user = postfix
+        group = postfix
+        mode = 0666
+    }
+    unix_listener auth-master {
+        user = vmail
+        group = vmail
+        mode = 0666
+    }
+    unix_listener auth-userdb {
+        user = vmail
+        group = vmail
+        mode = 0660
+    }
+}
+
+# LMTP server (Local Mail Transfer Protocol).
+# Reference: http://wiki2.dovecot.org/LMTP
+service lmtp {
+    user = vmail
+
+    # For higher volume sites, it may be desirable to increase the number of
+    # active listener processes. A range of 5 to 20 is probably good for most
+    # sites.
+    process_min_avail = 5
+
+    # Logging.
+    # Require 'info_log_path =' in 'protocol lmtp {}' block.
+    executable = lmtp -L
+
+    # Listening on socket file and TCP
+    unix_listener /var/spool/postfix/private/dovecot-lmtp {
+        user = postfix
+        group = postfix
+        mode = 0600
+    }
+
+    inet_listener lmtp {
+        # Listen on localhost (ipv4)
+        address = 127.0.0.1
+        port = 24
+    }
+}
+
+# Virtual mail accounts.
+userdb {
+    args = /etc/dovecot/dovecot-mysql.conf
+    driver = sql
+}
+passdb {
+    args = /etc/dovecot/dovecot-mysql.conf
+    driver = sql
+}
+
+# Master user.
+# Master users are able to log in as other users. It's also possible to
+# directly log in as any user using a master password, although this isn't
+# recommended.
+# Reference: http://wiki2.dovecot.org/Authentication/MasterUsers
+auth_master_user_separator = *
+passdb {
+    driver = passwd-file
+    args = /etc/dovecot/dovecot-master-users
+    master = yes
+}
+
+plugin {
+    auth_socket_path = /var/run/dovecot/auth-master
+
+    # Quota configuration.
+    # Reference: http://wiki2.dovecot.org/Quota/Configuration
+    quota = dict:user::proxy::quotadict
+    quota_rule = *:storage=1G
+    #quota_rule2 = *:messages=0
+    #quota_rule3 = Trash:storage=1G
+    #quota_rule4 = Junk:ignore
+
+    # Quota warning.
+    #
+    # If user suddenly receives a huge mail and the quota jumps from
+    # 85% to 95%, only the 95% script is executed.
+    #
+    # Only the command for the first exceeded limit is executed, so configure
+    # the highest limit first.
+    quota_warning = storage=100%% quota-warning 100 %u
+    quota_warning2 = storage=95%% quota-warning 95 %u
+    quota_warning3 = storage=90%% quota-warning 90 %u
+    quota_warning4 = storage=85%% quota-warning 85 %u
+
+    # allow user to become max 10% (or 50 MB) over quota
+    quota_grace = 10%%
+    #quota_grace = 50 M
+
+    # Custom Quota Exceeded Message.
+    # You can specify the message directly or read the message from a file.
+    #quota_exceeded_message = Quota exceeded, please try again later.
+    #quota_exceeded_message = </path/to/quota_exceeded_message.txt
+
+    # Plugin: expire.
+    #expire = Trash 7 Trash/* 7 Junk 30
+    #expire_dict = proxy::expire
+
+    # ACL and share folder
+    acl = vfile
+    acl_shared_dict = proxy::acl
+
+    # By default Dovecot doesn't allow using the IMAP "anyone" or
+    # "authenticated" identifier, because it would be an easy way to spam
+    # other users in the system. If you wish to allow it,
+    #acl_anyone = allow
+
+    # Pigeonhole managesieve service.
+    # Reference: http://wiki2.dovecot.org/Pigeonhole/Sieve/Configuration
+    # Per-user sieve settings.
+    sieve_dir = %Lh/sieve
+    sieve = %Lh/sieve/dovecot.sieve
+
+    # Global sieve settings.
+    sieve_global_dir = /home/vmail/sieve
+    # Note: if user has personal sieve script, global sieve rules defined in
+    #       sieve_default will be ignored. Please use sieve_before or
+    #       sieve_after instead.
+    #sieve_default =
+
+    sieve_before = /home/vmail/sieve/dovecot.sieve
+    #sieve_after =
+
+    # The maximum number of redirect actions that can be performed during a
+    # single script execution.
+    # The meaning of 0 differs based on your version. For pigeonhole-0.3.0 and
+    # beyond this means that redirect is prohibited. For older versions,
+    # however, this means that the number of redirects is unlimited.
+    #sieve_max_redirects = 4
+
+    # Reference: http://wiki2.dovecot.org/Plugins/MailboxAlias
+    mailbox_alias_old = Sent
+    mailbox_alias_new = Sent Messages
+    mailbox_alias_old2 = Sent
+    mailbox_alias_new2 = Sent Items
+}
+
+service quota-warning {
+    executable = script /usr/local/bin/dovecot-quota-warning.sh
+    unix_listener quota-warning {
+        user = vmail
+        group = vmail
+        mode = 0660
+    }
+}
+
+service dict {
+    unix_listener dict {
+        mode = 0660
+        user = vmail
+        group = vmail
+    }
+}
+
+dict {
+    #expire = db:/var/lib/dovecot/expire/expire.db
+    quotadict = mysql:/etc/dovecot/dovecot-used-quota.conf
+    acl = mysql:/etc/dovecot/dovecot-share-folder.conf
+}
+
+protocol lda {
+    # Reference: http://wiki2.dovecot.org/LDA
+    mail_plugins = $mail_plugins sieve
+    auth_socket_path = /var/run/dovecot/auth-master
+    log_path = /var/log/dovecot-sieve.log
+    lda_mailbox_autocreate = yes
+    lda_mailbox_autosubscribe = yes
+    postmaster_address = postmaster@brehm-online.com
+}
+
+protocol lmtp {
+    # Log file
+    info_log_path = /var/log/dovecot-lmtp.log
+
+    # Plugins
+    mail_plugins = quota sieve
+    postmaster_address = postmaster@brehm-online.com
+
+    lmtp_save_to_detail_mailbox = yes
+    recipient_delimiter = +
+}
+
+protocol imap {
+    mail_plugins = $mail_plugins imap_quota imap_acl
+    imap_client_workarounds = tb-extra-mailbox-sep
+
+    # Maximum number of IMAP connections allowed for a user from each IP address.
+    # NOTE: The username is compared case-sensitively.
+    # Default is 10.
+    # Increase it to avoid issue like below:
+    # "Maximum number of concurrent IMAP connections exceeded"
+    mail_max_userip_connections = 30
+}
+
+protocol pop3 {
+    mail_plugins = $mail_plugins
+    pop3_client_workarounds = outlook-no-nuls oe-ns-eoh
+    pop3_uidl_format = %08Xu%08Xv
+
+    # Maximum number of IMAP connections allowed for a user from each IP address.
+    # NOTE: The username is compared case-sensitively.
+    # Default is 10.
+    mail_max_userip_connections = 30
+}
+
+# Login processes. Refer to Dovecot wiki for more details:
+# http://wiki2.dovecot.org/LoginProcess
+service imap-login {
+    #inet_listener imap {
+    #    port = 143
+    #}
+    #inet_listener imaps {
+    #    port = 993
+    #    ssl = yes
+    #}
+    #
+    # Require Dovecot-2.2.19+
+    #inet_listener imap_haproxy {
+    #    port = 10143
+    #    haproxy = yes
+    #}
+
+    service_count = 1
+
+    # To avoid startup latency for new client connections, set process_min_avail
+    # to higher than zero. That many idling processes are always kept around
+    # waiting for new connections.
+    #process_min_avail = 0
+
+    # number of simultaneous IMAP connections
+    process_limit = 500
+
+    # vsz_limit should be fine at its default 64MB value
+    #vsz_limit = 64M
+}
+
+service pop3-login {
+    #inet_listener pop3 {
+    #    port = 110
+    #}
+    #inet_listener pop3s {
+    #    port = 995
+    #    ssl = yes
+    #}
+    #
+    # Require Dovecot-2.2.19+
+    #inet_listener pop3_haproxy {
+    #    port = 10110
+    #    haproxy = yes
+    #}
+
+    service_count = 1
+
+    # number of simultaneous POP3 connections
+    #process_limit = 500
+}
+
+service managesieve-login {
+    inet_listener sieve {
+        # Listen on localhost (ipv4)
+        #address = 127.0.0.1
+        port = 4190
+    }
+}
+
+namespace {
+    type = private
+    separator = /
+    prefix =
+    #location defaults to mail_location.
+    inbox = yes
+
+    # Refer to document for more details about alias mailbox:
+    # http://wiki2.dovecot.org/MailboxSettings
+    #
+    # Sent
+    mailbox Sent {
+        auto = subscribe
+        special_use = \Sent
+    }
+    mailbox "Sent Messages" {
+        auto = no
+        special_use = \Sent
+    }
+    mailbox "Sent Items" {
+        auto = no
+        special_use = \Sent
+    }
+
+    mailbox Drafts {
+        auto = subscribe
+        special_use = \Drafts
+    }
+
+    # Trash
+    mailbox Trash {
+        auto = subscribe
+        special_use = \Trash
+    }
+
+    mailbox "Deleted Messages" {
+        auto = no
+        special_use = \Trash
+    }
+
+    # Junk
+    mailbox Junk {
+        auto = subscribe
+        special_use = \Junk
+    }
+    mailbox Spam {
+        auto = no
+        special_use = \Junk
+    }
+    mailbox "Junk E-mail" {
+        auto = no
+        special_use = \Junk
+    }
+
+    # Archive
+    mailbox Archive {
+        auto = no
+        special_use = \Archive
+    }
+    mailbox Archives {
+        auto = no
+        special_use = \Archive
+    }
+}
+
+namespace {
+    type = shared
+    separator = /
+    prefix = Shared/%%u/
+    location = maildir:%%Lh/Maildir/:INDEX=%%Lh/Maildir/Shared/%%u
+    # this namespace should handle its own subscriptions or not.
+    subscriptions = yes
+    list = children
+}
+
+# Public mailboxes.
+# Refer to Dovecot wiki page for more details:
+# http://wiki2.dovecot.org/SharedMailboxes/Public
+#namespace {
+#    type = public
+#    separator = /
+#    prefix = Public/
+#
+#    # CONTROL=: Mark this public folder as read-only mailbox
+#    # INDEX=: Per-user \Seen flag
+#    location = maildir:/var/vmail/public/:CONTROL=~/Maildir/public:INDEX=~/Maildir/public
+#
+#    # Allow users to subscribe to the public folders.
+#    subscriptions = yes
+#}
diff --git a/motd b/motd
index 2c36a4a..7a9abdd 100644
--- a/motd
+++ b/motd
@@ -6,9 +6,8 @@ Debian GNU/Linux 10 (buster)
 |____/ \__,_|_|  \__,_|_| |_|
                              
 
-Es gibt Leute, die wollen lieber einen Stehplatz in der ersten Klasse
-als einen Sitzplatz in der dritten.
-		-- Kurt Tucholsky
+Wie man sein Kind nicht nennen sollte: 
+  Marc Rele 
 
 Today is Setting Orange, the 1st day of Bureaucracy in the YOLD 3186
 
-- 
2.39.5