From e8210cd7ee227d8c94be1ddde908c0d770eef99b Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Sun, 24 Dec 2023 13:44:55 +0100
Subject: [PATCH] mail: add vanpetegem.be, migrate webmaster

---
 modules/graphical/mail/default.nix                   |  2 +-
 modules/services/mail/default.nix                    | 12 ++++++++----
 secrets.nix                                          |  3 +--
 ...petegem.me.age => webmaster_at_vanpetegem.be.age} |  0
 4 files changed, 10 insertions(+), 7 deletions(-)
 rename secrets/passwords/services/mail/{webmaster_at_vanpetegem.me.age => webmaster_at_vanpetegem.be.age} (100%)

diff --git a/modules/graphical/mail/default.nix b/modules/graphical/mail/default.nix
index b82e4dbf..180aa55c 100644
--- a/modules/graphical/mail/default.nix
+++ b/modules/graphical/mail/default.nix
@@ -280,7 +280,7 @@ in
           };
           webmaster = makeAccount {
             name = "webmaster";
-            address = "webmaster@vanpetegem.me";
+            address = "webmaster@vanpetegem.be";
             host = "mail.vanpetegem.me";
             secretToolId = "webmaster";
             extraConfig = {
diff --git a/modules/services/mail/default.nix b/modules/services/mail/default.nix
index e1c6bedd..0a66d45d 100644
--- a/modules/services/mail/default.nix
+++ b/modules/services/mail/default.nix
@@ -29,13 +29,14 @@ in
         "robbevanpetegem.be"
         "robbevp.be"
         "toekomstlabo.be"
+        "vanpetegem.be"
         "vanpetegem.me"
       ];
       localDnsResolver = false;
       loginAccounts = {
         "charlotte@vanpetegem.me" = {
           hashedPasswordFile = config.age.secrets."passwords/services/mail/charlotte@vanpetegem.me".path;
-          aliases = [ "@chvp.be" "@cvpetegem.be" ];
+          aliases = [ "@chvp.be" "@cvpetegem.be" "charlotte@vanpetegem.be" ];
         };
         "huis@vanpetegem.me".hashedPasswordFile = config.age.secrets."passwords/services/mail/huis@vanpetegem.me".path;
         "noreply@vanpetegem.me" = {
@@ -45,7 +46,7 @@ in
         "peter@vanpetegem.me".hashedPasswordFile = config.age.secrets."passwords/services/mail/peter@vanpetegem.me".path;
         "postbot@vanpetegem.me" = {
           hashedPasswordFile = config.age.secrets."passwords/services/mail/postbot@vanpetegem.me".path;
-          aliases = [ "@vanpetegem.me" ];
+          aliases = [ "@vanpetegem.me" "@vanpetegem.be" ];
         };
         "robbe@vanpetegem.me" = {
           hashedPasswordFile = config.age.secrets."passwords/services/mail/robbe@vanpetegem.me".path;
@@ -59,7 +60,10 @@ in
           hashedPasswordFile = config.age.secrets."passwords/services/mail/hallo@robbe.be".path;
           aliases = [ "@robbe.be" "@robbevp.be" ];
         };
-        "webmaster@vanpetegem.me".hashedPasswordFile = config.age.secrets."passwords/services/mail/webmaster@vanpetegem.me".path;
+        "webmaster@vanpetegem.be" = {
+          hashedPasswordFile = config.age.secrets."passwords/services/mail/webmaster@vanpetegem.be".path;
+          aliases = [ "webmaster@vanpetegem.me" ];
+        };
       };
       indexDir = "${config.chvp.cachePrefix}/var/lib/dovecot/indices";
       fullTextSearch = {
@@ -99,7 +103,7 @@ in
       "passwords/services/mail/postbot@vanpetegem.me".file = ../../../secrets/passwords/services/mail/postbot_at_vanpetegem.me.age;
       "passwords/services/mail/robbe@robbevanpetegem.be".file = ../../../secrets/passwords/services/mail/robbe_at_robbevanpetegem.be.age;
       "passwords/services/mail/robbe@vanpetegem.me".file = ../../../secrets/passwords/services/mail/robbe_at_vanpetegem.me.age;
-      "passwords/services/mail/webmaster@vanpetegem.me".file = ../../../secrets/passwords/services/mail/webmaster_at_vanpetegem.me.age;
+      "passwords/services/mail/webmaster@vanpetegem.be".file = ../../../secrets/passwords/services/mail/webmaster_at_vanpetegem.be.age;
     };
   };
 }
diff --git a/secrets.nix b/secrets.nix
index a95f1571..09b0f304 100644
--- a/secrets.nix
+++ b/secrets.nix
@@ -50,8 +50,7 @@ in
   "secrets/passwords/services/mail/postbot_at_vanpetegem.me.age".publicKeys = [ lasting-integrity ] ++ users;
   "secrets/passwords/services/mail/robbe_at_robbevanpetegem.be.age".publicKeys = [ lasting-integrity ] ++ users;
   "secrets/passwords/services/mail/robbe_at_vanpetegem.me.age".publicKeys = [ lasting-integrity ] ++ users;
-  "secrets/passwords/services/mail/ugent_at_cvpetegem.be.age".publicKeys = [ lasting-integrity ] ++ users;
-  "secrets/passwords/services/mail/webmaster_at_vanpetegem.me.age".publicKeys = [ lasting-integrity ] ++ users;
+  "secrets/passwords/services/mail/webmaster_at_vanpetegem.be.age".publicKeys = [ lasting-integrity ] ++ users;
   "secrets/passwords/services/ssmtp-pass.age".publicKeys = hosts ++ users;
 
   "secrets/passwords/services/acme.age".publicKeys = servers ++ users;
diff --git a/secrets/passwords/services/mail/webmaster_at_vanpetegem.me.age b/secrets/passwords/services/mail/webmaster_at_vanpetegem.be.age
similarity index 100%
rename from secrets/passwords/services/mail/webmaster_at_vanpetegem.me.age
rename to secrets/passwords/services/mail/webmaster_at_vanpetegem.be.age