diff --git a/modules/server/taf/default.nix b/modules/server/taf/default.nix index 6427b41..d7395f1 100644 --- a/modules/server/taf/default.nix +++ b/modules/server/taf/default.nix @@ -48,22 +48,24 @@ ]; quota = "1T"; sieveScript = '' - require ["fileinto", "regex", "variables"]; + require ["include", "fileinto", "mailbox", "copy", "regex", "variables"]; + + include :personal "hiddensieve"; if address :is :domain "X-Original-To" "lyes.eu" { if address :localpart :regex "X-Original-To" "^(([a-zA-Z]+\\.)*([a-zA-Z]+))(-([a-zA-Z0-9_.\\-]*))?''$" { set "mbox_candidate" "INBOX.''${1}"; - fileinto "''${mbox_candidate}"; + fileinto :create "''${mbox_candidate}"; } else { - fileinto "INBOX.other"; + fileinto :create "INBOX.other"; } } elsif address :is "X-Original-To" "lyes@mail.lyes.eu" { - fileinto "INBOX"; + fileinto :create "INBOX"; } else { - fileinto "INBOX.other"; + fileinto :create "INBOX.other"; } ''; }; @@ -115,5 +117,13 @@ owner = "postfix"; file = ../../../secrets/lyes/mail-passwd.age; }; + + lyes-hidden-sieve = { + file = ../../../secrets/lyes/hidden-sieve.age; + path = "/var/sieve/lyes@mail.lyes.eu/scripts/hiddensieve.sieve"; + owner = "virtualMail"; + group = "virtualMail"; + mode = "660"; + }; }; } diff --git a/secrets.nix b/secrets.nix index 0cb5945..6b8f51f 100644 --- a/secrets.nix +++ b/secrets.nix @@ -8,6 +8,7 @@ in { # Lyes "secrets/lyes/mail-passwd.age".publicKeys = [ lyes zora ]; + "secrets/lyes/hidden-sieve.age".publicKeys = [ lyes zora ]; # Zora "secrets/zora/services/kanidm-admin-password.age".publicKeys = all; diff --git a/secrets/lyes/hidden-sieve.age b/secrets/lyes/hidden-sieve.age new file mode 100644 index 0000000..c516913 Binary files /dev/null and b/secrets/lyes/hidden-sieve.age differ diff --git a/users/lyes/desktop/packages.nix b/users/lyes/desktop/packages.nix index 4c4c17e..69ed2c4 100644 --- a/users/lyes/desktop/packages.nix +++ b/users/lyes/desktop/packages.nix @@ -138,10 +138,7 @@ in { via # Proton - protonmail-bridge-gui - protonmail-desktop protonvpn-gui - proton-pass # Multimedia pipewire.dev