From 5bf9af1531bbdd1c20a40d1319d835b23b3fa97d Mon Sep 17 00:00:00 2001
From: niten <niten@fudo.org>
Date: Fri, 29 Sep 2023 14:03:02 -0700
Subject: [PATCH] Make sure we can delete the sieves

---
 dovecot.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/dovecot.nix b/dovecot.nix
index 739089b..943739c 100644
--- a/dovecot.nix
+++ b/dovecot.nix
@@ -210,8 +210,12 @@ in {
               filePath = ./sieves + "/${filename}";
               fileBaseName = stripExt "sieve" filename;
             in ''
-              cp ${filePath} ${sieveDirectory}/${fileBaseName}.sieve
-              sievec ${sieveDirectory}/${fileBaseName}.sieve ${sieveDirectory}/${fileBaseName}.svbin
+              if [ -f "${sieveDirectory}/${fileBaseName}.sieve" ]; then
+                rm "${sieveDirectory}/${fileBaseName}.sieve" "${sieveDirectory}/${fileBaseName}.svbin"
+              fi
+              cp ${filePath} "${sieveDirectory}/${fileBaseName}.sieve"
+              sievec "${sieveDirectory}/${fileBaseName}.sieve" "${sieveDirectory}/${fileBaseName}.svbin"
+              chmod u+w "${sieveDirectory}/${fileBaseName}.sieve"
             '';
         in {
           wantedBy = [ "dovecot2.service" ];
@@ -313,7 +317,7 @@ in {
           protocol imap {
             mail_max_userip_connections = ${toString cfg.max-user-connections}
             mail_plugins = $mail_plugins imap_sieve
-          }
+          }n
 
           protocol lmtp {
             mail_plugins = $mail_plugins sieve