zaphyra's git: nixfiles

zaphyra's nixfiles

commit 55d0f32da33f8c5123954f210d3b639c28bd057d
parent 9fd9a8a5e25c221c736811ab6b60d62553b036e3
Author: Katja Ramona Sophie Kwast (zaphyra) <git@zaphyra.eu>
Date: Sat, 26 Jul 2025 19:20:08 +0200

config/nixos/modules/presets/zaphyra/mailServer: finally working sieve!

1 file changed, 10 insertions(+), 4 deletions(-)
M
config/nixos/modules/presets/zaphyra/mailServer.nix
|
14
++++++++++----
diff --git a/config/nixos/modules/presets/zaphyra/mailServer.nix b/config/nixos/modules/presets/zaphyra/mailServer.nix
@@ -139,7 +139,8 @@ in
           };
         }) cfg.extraDomains);
 
-      systemd.services.dovecot.after = [ "sops-install-secrets.service" ];
+      systemd.services.dovecot2.after = [ "sops-install-secrets.service" ];
+
       sops.secrets = {
         "mailPasswords/katja@zaphyra.eu" = { };
         "mailPasswords/gts@zaphyra.eu" = { };

@@ -151,8 +152,9 @@ in
           sopsFile = inputs.self.sopsSecrets.zaphyra.sieve;
           key = "katja@zaphyra.eu";
           restartUnits = [ "dovecot2.service" ];
-          owner = "dovecot2";
-          path = "/etc/dovecot/sieve/katja@zaphyra.eu.sieve";
+          owner = "virtualMail";
+          group = "virtualMail";
+          path = "/etc/dovecot/sieve/katja-zaphyra-eu.sieve";
         };
       };
 

@@ -250,7 +252,7 @@ in
             hashedPasswordFile = config.sops.secrets."mailPasswords/katja@zaphyra.eu".path;
             sieveScript = ''
               require ["include"];
-              include :global "katja@zaphyra.eu";
+              include :global "katja-zaphyra-eu";
             '';
             aliases = [
               "@zaphyra.eu"

@@ -281,6 +283,10 @@ in
         };
       };
 
+      services.dovecot2.pluginSettings = {
+        sieve_global = "/etc/dovecot/sieve";
+      };
+
       modules.services.resticBackup.paths.mail = {
         passwordFile = config.sops.secrets."resticPasswords/mail".path;
         paths = [