From 149cc2668856f5f6c1efc47337677a07c51827fc Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sun, 24 Dec 2023 13:47:49 +0100 Subject: [PATCH] mail: migrate charlotte to vanpetegem.be --- modules/graphical/mail/default.nix | 2 +- modules/services/mail/default.nix | 10 +++++----- secrets.nix | 2 +- ...anpetegem.me.age => charlotte_at_vanpetegem.be.age} | 0 4 files changed, 7 insertions(+), 7 deletions(-) rename secrets/passwords/services/mail/{charlotte_at_vanpetegem.me.age => charlotte_at_vanpetegem.be.age} (100%) diff --git a/modules/graphical/mail/default.nix b/modules/graphical/mail/default.nix index 180aa55c..7b069b4d 100644 --- a/modules/graphical/mail/default.nix +++ b/modules/graphical/mail/default.nix @@ -230,7 +230,7 @@ in accounts = { personal = makeAccount { name = "personal"; - address = "charlotte@vanpetegem.me"; + address = "charlotte@vanpetegem.be"; host = "mail.vanpetegem.me"; secretToolId = "personal-mail"; extraConfig = { diff --git a/modules/services/mail/default.nix b/modules/services/mail/default.nix index 0a66d45d..60cd2a3e 100644 --- a/modules/services/mail/default.nix +++ b/modules/services/mail/default.nix @@ -34,9 +34,9 @@ in ]; localDnsResolver = false; loginAccounts = { - "charlotte@vanpetegem.me" = { - hashedPasswordFile = config.age.secrets."passwords/services/mail/charlotte@vanpetegem.me".path; - aliases = [ "@chvp.be" "@cvpetegem.be" "charlotte@vanpetegem.be" ]; + "charlotte@vanpetegem.be" = { + hashedPasswordFile = config.age.secrets."passwords/services/mail/charlotte@vanpetegem.be".path; + aliases = [ "@chvp.be" "@cvpetegem.be" "charlotte@vanpetegem.me" ]; }; "huis@vanpetegem.me".hashedPasswordFile = config.age.secrets."passwords/services/mail/huis@vanpetegem.me".path; "noreply@vanpetegem.me" = { @@ -72,7 +72,7 @@ in }; lmtpSaveToDetailMailbox = "no"; extraVirtualAliases = { - "team@accentor.tech" = [ "charlotte@vanpetegem.me" "robbe@vanpetegem.me" ]; + "team@accentor.tech" = [ "charlotte@vanpetegem.be" "robbe@vanpetegem.me" ]; }; forwards = { "info@toekomstlabo.be" = "robbe+toekomstlabo@robbevanpetegem.be"; @@ -95,7 +95,7 @@ in ''; age.secrets = { - "passwords/services/mail/charlotte@vanpetegem.me".file = ../../../secrets/passwords/services/mail/charlotte_at_vanpetegem.me.age; + "passwords/services/mail/charlotte@vanpetegem.be".file = ../../../secrets/passwords/services/mail/charlotte_at_vanpetegem.be.age; "passwords/services/mail/hallo@robbe.be".file = ../../../secrets/passwords/services/mail/hallo_at_robbe.be.age; "passwords/services/mail/huis@vanpetegem.me".file = ../../../secrets/passwords/services/mail/huis_at_vanpetegem.me.age; "passwords/services/mail/noreply@vanpetegem.me".file = ../../../secrets/passwords/services/mail/noreply_at_vanpetegem.me.age; diff --git a/secrets.nix b/secrets.nix index 09b0f304..039da406 100644 --- a/secrets.nix +++ b/secrets.nix @@ -42,7 +42,7 @@ in "secrets/files/services/phone-push-url.age".publicKeys = hosts ++ users; - "secrets/passwords/services/mail/charlotte_at_vanpetegem.me.age".publicKeys = [ lasting-integrity ] ++ users; + "secrets/passwords/services/mail/charlotte_at_vanpetegem.be.age".publicKeys = [ lasting-integrity ] ++ users; "secrets/passwords/services/mail/hallo_at_robbe.be.age".publicKeys = [ lasting-integrity ] ++ users; "secrets/passwords/services/mail/huis_at_vanpetegem.me.age".publicKeys = [ lasting-integrity ] ++ users; "secrets/passwords/services/mail/noreply_at_vanpetegem.me.age".publicKeys = [ lasting-integrity ] ++ users; diff --git a/secrets/passwords/services/mail/charlotte_at_vanpetegem.me.age b/secrets/passwords/services/mail/charlotte_at_vanpetegem.be.age similarity index 100% rename from secrets/passwords/services/mail/charlotte_at_vanpetegem.me.age rename to secrets/passwords/services/mail/charlotte_at_vanpetegem.be.age