From 9225d12da88a1d3eb46c49d0f47d2c06621bfd70 Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@paraiso.me>
Date: Wed, 7 Sep 2016 17:57:04 +0200
Subject: [PATCH 1/5] [enh] Remove useless comments autogenerated in the past

---
 data/templates/dovecot/dovecot.conf | 2 --
 1 file changed, 2 deletions(-)

diff --git a/data/templates/dovecot/dovecot.conf b/data/templates/dovecot/dovecot.conf
index 3daa670bf..244b78780 100644
--- a/data/templates/dovecot/dovecot.conf
+++ b/data/templates/dovecot/dovecot.conf
@@ -1,5 +1,3 @@
-# 2.1.7: /etc/dovecot/dovecot.conf
-# OS: Linux 3.2.0-3-686-pae i686 Debian wheezy/sid ext4
 listen = *, ::
 auth_mechanisms = plain login
 login_greeting = Dovecot ready!!

From e3f4686c90f83dcbd985145e8aab25f0f89e17a6 Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@paraiso.me>
Date: Wed, 7 Sep 2016 18:04:29 +0200
Subject: [PATCH 2/5] [enh] Hide the fact that we are speaking to dovecot

---
 data/templates/dovecot/dovecot.conf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/data/templates/dovecot/dovecot.conf b/data/templates/dovecot/dovecot.conf
index 244b78780..00916d88d 100644
--- a/data/templates/dovecot/dovecot.conf
+++ b/data/templates/dovecot/dovecot.conf
@@ -1,6 +1,5 @@
 listen = *, ::
 auth_mechanisms = plain login
-login_greeting = Dovecot ready!!
 mail_gid = 8
 mail_home = /var/mail/%n
 mail_location = maildir:/var/mail/%n

From e4832234185d45322318041dde99131b9b30c2f5 Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@paraiso.me>
Date: Wed, 7 Sep 2016 18:20:21 +0200
Subject: [PATCH 3/5] [enh] reorder dovecot main configuration so that it is
 easier to read and extend

---
 data/templates/dovecot/dovecot.conf | 64 ++++++++++++++++-------------
 1 file changed, 36 insertions(+), 28 deletions(-)

diff --git a/data/templates/dovecot/dovecot.conf b/data/templates/dovecot/dovecot.conf
index 00916d88d..af745c93d 100644
--- a/data/templates/dovecot/dovecot.conf
+++ b/data/templates/dovecot/dovecot.conf
@@ -1,15 +1,44 @@
 listen = *, ::
 auth_mechanisms = plain login
+
 mail_gid = 8
 mail_home = /var/mail/%n
 mail_location = maildir:/var/mail/%n
 mail_uid = 500
+
+protocols = imap sieve
+
+mail_plugins = $mail_plugins quota
+
+ssl = yes
+ssl_cert = </etc/yunohost/certs/{{ main_domain }}/crt.pem
+ssl_key = </etc/yunohost/certs/{{ main_domain }}/key.pem
+ssl_protocols = !SSLv2 !SSLv3
+
 passdb {
   args = /etc/dovecot/dovecot-ldap.conf
   driver = ldap
 }
-protocols = imap sieve
-mail_plugins = $mail_plugins quota
+
+userdb {
+  args = /etc/dovecot/dovecot-ldap.conf
+  driver = ldap
+}
+
+protocol imap {
+  imap_client_workarounds =
+  mail_plugins = $mail_plugins imap_quota antispam
+}
+
+protocol lda {
+  auth_socket_path = /var/run/dovecot/auth-master
+  mail_plugins = quota sieve
+  postmaster_address = postmaster@{{ main_domain }}
+}
+
+protocol sieve {
+}
+
 service auth {
   unix_listener /var/spool/postfix/private/auth {
     group = postfix
@@ -23,26 +52,11 @@ service auth {
   }
 }
 
-protocol sieve {
-}
-
-ssl = yes
-ssl_cert = </etc/yunohost/certs/{{ main_domain }}/crt.pem
-ssl_key = </etc/yunohost/certs/{{ main_domain }}/key.pem
-ssl_protocols = !SSLv2 !SSLv3
-
-userdb {
-  args = /etc/dovecot/dovecot-ldap.conf
-  driver = ldap
-}
-protocol imap {
-  imap_client_workarounds =
-  mail_plugins = $mail_plugins imap_quota antispam
-}
-protocol lda {
-  auth_socket_path = /var/run/dovecot/auth-master
-  mail_plugins = quota sieve
-  postmaster_address = postmaster@{{ main_domain }}
+service quota-warning {
+  executable = script /usr/bin/quota-warning.sh
+  user = vmail
+  unix_listener quota-warning {
+  }
 }
 
 plugin {
@@ -80,9 +94,3 @@ plugin {
   quota_warning3 = -storage=100%% quota-warning below %u # user is no longer over quota
 }
 
-service quota-warning {
-  executable = script /usr/bin/quota-warning.sh
-  user = vmail
-  unix_listener quota-warning {
-  }
-}

From 7b48d7b9fa45c27f3025416c1a44f1f9d95cbca8 Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@paraiso.me>
Date: Wed, 7 Sep 2016 18:37:53 +0200
Subject: [PATCH 4/5] [enh] Remove autocreate plugin related settings, unused
 now

autosubscribe & autosubscribe2 are part of the autocreate plugin configuration.

Should have been removed with f36e4e2a837ae1947aa6f196622f5e3bed637a9
See https://github.com/YunoHost/yunohost-config-dovecot/pull/3
---
 data/templates/dovecot/dovecot.conf | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/data/templates/dovecot/dovecot.conf b/data/templates/dovecot/dovecot.conf
index af745c93d..fbaa61ca9 100644
--- a/data/templates/dovecot/dovecot.conf
+++ b/data/templates/dovecot/dovecot.conf
@@ -77,11 +77,6 @@ plugin {
   antispam_pipe_program_notspam_arg = learn_ham
 }
 
-plugin {
-  autosubscribe = Trash
-  autosubscribe2 = Junk
-}
-
 plugin {
   quota = maildir:User quota
   quota_rule2 = SPAM:ignore

From ea17e9fa80094d1a1c47059cdf428f876bd749f9 Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@paraiso.me>
Date: Fri, 9 Sep 2016 17:12:50 +0200
Subject: [PATCH 5/5] [enh] Allow for dovecot configuration extensions

---
 data/hooks/conf_regen/25-dovecot     | 7 +++++++
 data/templates/dovecot/dovecot.conf  | 5 +++++
 data/templates/dovecot/post-ext.conf | 1 +
 data/templates/dovecot/pre-ext.conf  | 1 +
 4 files changed, 14 insertions(+)
 create mode 100644 data/templates/dovecot/post-ext.conf
 create mode 100644 data/templates/dovecot/pre-ext.conf

diff --git a/data/hooks/conf_regen/25-dovecot b/data/hooks/conf_regen/25-dovecot
index 5d82470a5..4c5ae24c1 100755
--- a/data/hooks/conf_regen/25-dovecot
+++ b/data/hooks/conf_regen/25-dovecot
@@ -26,11 +26,18 @@ do_pre_regen() {
       's/^\(listen =\).*/\1 */' \
       "${dovecot_dir}/dovecot.conf"
   fi
+
+  mkdir -p "${dovecot_dir}/yunohost.d"
+  cp pre-ext.conf "${dovecot_dir}/yunohost.d"
+  cp post-ext.conf "${dovecot_dir}/yunohost.d"
 }
 
 do_post_regen() {
   regen_conf_files=$1
 
+  sudo mkdir -p "/etc/dovecot/yunohost.d/pre-ext.d"
+  sudo mkdir -p "/etc/dovecot/yunohost.d/post-ext.d"
+
   # create vmail user
   id vmail > /dev/null 2>&1 \
     || sudo adduser --system --ingroup mail --uid 500 vmail
diff --git a/data/templates/dovecot/dovecot.conf b/data/templates/dovecot/dovecot.conf
index fbaa61ca9..5ea10ea79 100644
--- a/data/templates/dovecot/dovecot.conf
+++ b/data/templates/dovecot/dovecot.conf
@@ -1,3 +1,5 @@
+!include yunohost.d/pre-ext.conf
+
 listen = *, ::
 auth_mechanisms = plain login
 
@@ -10,6 +12,7 @@ protocols = imap sieve
 
 mail_plugins = $mail_plugins quota
 
+
 ssl = yes
 ssl_cert = </etc/yunohost/certs/{{ main_domain }}/crt.pem
 ssl_key = </etc/yunohost/certs/{{ main_domain }}/key.pem
@@ -30,6 +33,7 @@ protocol imap {
   mail_plugins = $mail_plugins imap_quota antispam
 }
 
+
 protocol lda {
   auth_socket_path = /var/run/dovecot/auth-master
   mail_plugins = quota sieve
@@ -89,3 +93,4 @@ plugin {
   quota_warning3 = -storage=100%% quota-warning below %u # user is no longer over quota
 }
 
+!include yunohost.d/post-ext.conf
diff --git a/data/templates/dovecot/post-ext.conf b/data/templates/dovecot/post-ext.conf
new file mode 100644
index 000000000..5d3b2cdf3
--- /dev/null
+++ b/data/templates/dovecot/post-ext.conf
@@ -0,0 +1 @@
+!include_try post-ext.d/*.conf
diff --git a/data/templates/dovecot/pre-ext.conf b/data/templates/dovecot/pre-ext.conf
new file mode 100644
index 000000000..a72103339
--- /dev/null
+++ b/data/templates/dovecot/pre-ext.conf
@@ -0,0 +1 @@
+!include_try pre-ext.d/*.conf