From 7d3d409c553ea66a03df752e869e3fd1b6c32ceb Mon Sep 17 00:00:00 2001
From: Tobias Herre <tobias.herre@wikimedia.de>
Date: Tue, 31 Oct 2023 17:25:01 +0100
Subject: [PATCH] Options for ssl and protocols

---
 templates/dovecot/dovecot.conf.mustache | 34 ++++++++++++++++++-------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/templates/dovecot/dovecot.conf.mustache b/templates/dovecot/dovecot.conf.mustache
index 5bec579..0fd6b26 100644
--- a/templates/dovecot/dovecot.conf.mustache
+++ b/templates/dovecot/dovecot.conf.mustache
@@ -4,14 +4,17 @@
 
 protocols = {{#vars.dovecot.cfg.protocols}} {{.}} {{/vars.dovecot.cfg.protocols}}
 
-service imap-login {
-	inet_listener imap {
-    		#port = 143
-  	}
-	inet_listener imaps {
-		port = 993
-		ssl = yes
-	}
+#service imap-login {
+#	inet_listener imap {
+#    		#port = 143
+#  	}
+#
+#{{#vars.dovecot.cfg.ssl}}
+#	inet_listener imaps {
+#		port = 993
+#		ssl = yes
+#	}
+#{{/vars.dovecot.cfg.ssl}}
 
 	# Number of connections to handle before starting a new process. Typically
 	# the only useful values are 0 (unlimited) or 1. 1 is more secure, but 0
@@ -23,12 +26,14 @@ service imap-login {
 
 	# If you set service_count=0, you probably need to grow this.
 	#vsz_limit = $default_vsz_limit
-}
+#}
 
 protocol imap {
 
+{{#vars.dovecot.cfg.ssl}}
 	ssl_cert = <{{vars.dovecot.imap_cert}}
 	ssl_key = <{{vars.dovecot.imap_key}}
+{{/vars.dovecot.cfg.ssl}}
 
 	# Space separated list of plugins to load (default is global mail_plugins).
 	#mail_plugins = $mail_plugins
@@ -40,8 +45,10 @@ protocol imap {
 
 protocol submission {
 
+{{#vars.dovecot.cfg.ssl}}
 	ssl_cert = <{{vars.dovecot.submission_cert}}
 	ssl_key = <{{vars.dovecot.submission_key}}
+{{/vars.dovecot.cfg.ssl}}
 
 	# Space separated list of plugins to load (default is global mail_plugins).
 	#mail_plugins = $mail_plugins
@@ -51,6 +58,15 @@ protocol submission {
 	#mail_max_userip_connections = 10
 }
 
+protocol lda {
+  mail_plugins = $mail_plugins sieve
+}
+protocol lmtp {
+  mail_plugins = $mail_plugins sieve
+}
+
+
+
 
 {{#vars.dovecot.cfg.userdbs}}
 userdb {