Commit a7e0b8c49d30

Vincent Demeester <vincent@sbr.pm>
2026-06-10 17:05:07
refactor: move imapfilter services from athena to sakhalin
Moved imapfilter, imapfilter-rules-updater, and mail-monitor from athena to sakhalin in preparation for athena's Alpine diskless migration. Removed passage (desktop tool) from athena. Re-encrypted icloud secret for sakhalin. Removed stale searxng secret.
main
1 parent c3624c1
Changed files (4)
systems
athena
home.nix
sakhalin
extra.nix
home.nix
secrets.nix
systems/athena/home.nix
@@ -1,11 +1,5 @@
 { ... }:
 {
-  imports = [
-    ../../home/common/desktop/passage.nix
-    ../../home/common/services/goimapnotify.nix
-    ../../home/common/services/imapfilter.nix
-    ../../home/common/services/imapfilter-rules-updater.nix
-    ../../home/common/services/mail-monitor.nix
-  ];
-
+  # Mail services (imapfilter, goimapnotify, mail-monitor) moved to sakhalin
+  # Passage is a desktop tool, not needed on a DNS server
 }
systems/sakhalin/extra.nix
@@ -92,6 +92,12 @@ in
   security.tpm2.enable = lib.mkForce false;
 
   # Age secrets
+  age.secrets."icloud-vdemeester-password" = {
+    file = ../../secrets/mails/icloud-vdemeester.age;
+    mode = "400";
+    owner = "vincent";
+    group = "users";
+  };
   age.secrets."grafana-admin-password" = {
     file = ../../secrets/sakhalin/grafana-admin-password.age;
     mode = "400";
@@ -113,12 +119,6 @@ in
     mode = "400";
     owner = "prometheus";
   };
-  age.secrets."searxng-secret-key" = {
-    file = ../../secrets/sakhalin/searxng-secret-key.age;
-    mode = "400";
-    owner = "searx";
-    group = "searx";
-  };
 
   systemd.services.n8n.environment = {
     N8N_SECURE_COOKIE = "false";
systems/sakhalin/home.nix
@@ -1,5 +1,11 @@
 { pkgs, ... }:
 {
+  imports = [
+    ../../home/common/services/imapfilter.nix
+    ../../home/common/services/imapfilter-rules-updater.nix
+    ../../home/common/services/mail-monitor.nix
+  ];
+
   home.packages = with pkgs; [
     download-kiwix-zim
   ];
secrets.nix
@@ -46,7 +46,10 @@ in
   "secrets/carthage/restic-aix-password.age".publicKeys = users ++ [ carthage ];
 
   # Mail passwords
-  "secrets/mails/icloud-vdemeester.age".publicKeys = users ++ [ athena ];
+  "secrets/mails/icloud-vdemeester.age".publicKeys = users ++ [
+    athena
+    sakhalin
+  ];
 
   # Red Hat
   "secrets/redhat/krb5.conf.age".publicKeys = users ++ [