From afa041d39d619d9325983012b5d431aa4b8d04c7 Mon Sep 17 00:00:00 2001
From: psy <psy@darmstadt.ccc.de>
Date: Fri, 12 Feb 2021 15:59:10 +0100
Subject: [PATCH] add imap sieve setting to mail plugins

---
 defaults/main.yml         | 1 +
 templates/20-imap.conf.j2 | 6 +-----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index aa18157..e0f88e1 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -10,3 +10,4 @@ dovecot:
   user: []
   quota: ""
   quota_grace: "10"
+  imap_sieve: False
diff --git a/templates/20-imap.conf.j2 b/templates/20-imap.conf.j2
index 9929812..ebfd741 100644
--- a/templates/20-imap.conf.j2
+++ b/templates/20-imap.conf.j2
@@ -90,11 +90,7 @@
 
 protocol imap {
   # Space separated list of plugins to load (default is global mail_plugins).
-  {% if dovecot.quota -%}
-  mail_plugins = $mail_plugins imap_quota
-  {% else -%}
-  #mail_plugins = $mail_plugins
-  {% endif -%}
+  mail_plugins = $mail_plugins{% if dovecot.quota %} imap_quota{% endif %}{% if dovecot.imap_sieve %} imap_sieve{% endif %}
 
   # Maximum number of IMAP connections allowed for a user from each IP address.
   # NOTE: The username is compared case-sensitively.