From f68e63c1c89a79d46be90c592287e1bb45f45799 Mon Sep 17 00:00:00 2001
From: niten <niten@fudo.org>
Date: Mon, 25 Sep 2023 12:28:53 -0700
Subject: [PATCH] sievePath -> sieveDirectory

---
 dovecot.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/dovecot.nix b/dovecot.nix
index 5995e12..858df2c 100644
--- a/dovecot.nix
+++ b/dovecot.nix
@@ -199,7 +199,10 @@ in {
           let
             filePath = ./sieves + "/${filename}";
             fileBaseName = stripExt "sieve" filename;
-          in "sievec ${filePath} ${sieveDirectory}/${fileBaseName}.svbin";
+          in ''
+            sievec ${filePath} ${sieveDirectory}/${fileBaseName}.svbin
+            cp ${filePath} ${sieveDirectory}/${fileBaseName}.sieve
+          '';
       in {
         wantedBy = [ "dovecot2.service" ];
         before = [ "dovecot2.service" ];
@@ -359,12 +362,12 @@ in {
             # From elsewhere to Spam folder
             imapsieve_mailbox1_name = Junk
             imapsieve_mailbox1_causes = COPY
-            imapsieve_mailbox1_before = file:${sievePath}/report-spam.sieve
+            imapsieve_mailbox1_before = file:${sieveDirectory}/spam.svbin
             # From Spam folder to elsewhere
             imapsieve_mailbox2_name = *
             imapsieve_mailbox2_from = Junk
             imapsieve_mailbox2_causes = COPY
-            imapsieve_mailbox2_before = file:${sievePath}/report-ham.sieve
+            imapsieve_mailbox2_before = file:${sieveDirectory}/ham.svbin
 
             sieve_pipe_bin_dir = ${pipeBin}/bin
             sieve_global_extensions = +vnd.dovecot.pipe +vnd.dovecot.environment