commit 710f5055c742c953193de8e596ab082b064bcfb0
parent 847657c84fca6363e8e0c93f2cd0522039ae577b
Author: Katja (ctucx) <git@ctu.cx>
Date: Wed, 1 Jan 2025 13:59:48 +0100
parent 847657c84fca6363e8e0c93f2cd0522039ae577b
Author: Katja (ctucx) <git@ctu.cx>
Date: Wed, 1 Jan 2025 13:59:48 +0100
machines/hector/mail: add mail-account `gts@zuggeschmack.de`
4 files changed, 39 insertions(+), 11 deletions(-)
diff --git a/machines/hector/mail/default.nix b/machines/hector/mail/default.nix @@ -35,6 +35,7 @@ in { age.secrets.restic-mail.file = ./. + "/../../../secrets/${config.networking.hostName}/restic/mail.age"; age.secrets.mail-password-katja.file = ./. + "/../../../secrets/${config.networking.hostName}/mail/password-katja-ctu.cx.age"; age.secrets.mail-password-gts.file = ./. + "/../../../secrets/${config.networking.hostName}/mail/password-gts-ctu.cx.age"; + age.secrets.mail-password-gts-zug.file = ./. + "/../../../secrets/${config.networking.hostName}/mail/password-gts-zuggeschmack.de.age"; age.secrets.mail-password-vaultwarden.file = ./. + "/../../../secrets/${config.networking.hostName}/mail/password-vaultwarden-ctu.cx.age"; dns.zones = with pkgs.dns.lib.combinators; let @@ -67,6 +68,15 @@ in { }; }; + "zuggeschmack.de" = { + inherit MX TXT; + + subdomains = { + _dmarc.TXT = [ DMARC ]; + "mail._domainkey".TXT = [ "v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDf0PX32wWq068cThCnAaX1RJMBiMo6pGfT/VOp9/IzXWmNO2aSyWEFp5lVwYFJnlGX1Sg1uvThICVDiscOqG5jBUAc0gl3SPEBFJ0cqLl7CYhD3Nkvgc8+7zn4huKvFGYXRSDqQm+AL4SSEjZ8hF+N9bGxt0bYu2WlGwZX8mTptwIDAQAB" ]; + }; + }; + "thein.ovh" = { inherit MX TXT; @@ -144,6 +154,7 @@ in { "ctucx.de" "thein.ovh" "flauschehorn.sexy" + "zuggeschmack.de" ]; loginAccounts = { @@ -164,6 +175,10 @@ in { "gts@ctu.cx" = { hashedPasswordFile = config.age.secrets.mail-password-gts.path; }; + + "gts@zuggeschmack.de" = { + hashedPasswordFile = config.age.secrets.mail-password-gts-zug.path; + }; }; };
diff --git a/secrets/hector/mail/password-gts-ctu.cx.age b/secrets/hector/mail/password-gts-ctu.cx.age @@ -1,13 +1,12 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1TFdOVzlhc1RiVlNTTnRK -alNySy9KNHE1ekFLQ0huN0w1N3NtSGdoZkUwCkxKYjVBVTdJWDdSUXIvVXcxc0hV -MUluQTlaOHhnMTRUeDZuazRYTVBnV2sKLT4gc3NoLWVkMjU1MTkgeWFMSFNRIGRm -TTRtOUxjdVNUV1B3cXFadTd1MHZyeHF4MDlFWFB6MTk4Y2RRL2R3Z0UKM3d0SEQ1 -cWxZL3NCQzliKzhHdEJGRWlLT1NHNks0YU9rOEp2S1lCQWhqTQotPiB5fHwwLWdy -ZWFzZSB7PXoxMUVPCnFHbGJWbWFJOE5TcHZLTWIycGpxZVVtTjI0Sy9hd0ZoNWE1 -SS9vbU9KTERTMkV0aUlxWkQyUisxUzgvSnFYZnkKMEc4cmJLbnlCQy9CTkVoeERO -emo3N3BmYUdiNDYrYVVVWEVxQkdKdAotLS0gOS9TNVJHdXByMk8vWDBFcUNUTnZO -ZHd1OFAwMUhjOFhueStBT0hDNXlMVQpsftaRblQ1LwF/9vRqTFnY6pjFV3Dawooh -YBH5kTAnArfXstEZw0/D2QG3LmRVJ8eJuSq6ph4GUPd+yZgHAX0yztZ+zI2otnw+ -FUEGZLa9bp0FJMKQI3R7i32J8Q== +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBXQWxMbHZNWkdtZnBUOHpX +WDJBQzA1M1BQTWRaY2JjVnJPeE5wek1WSmxRCjFwd29RRU82Y3dOTnhqZXlwQkF2 +VTBzV01DRFp5YUJhbG5iS1dmVlVORWsKLT4gc3NoLWVkMjU1MTkgeWFMSFNRIENE +eFgxZDRHSWdCcVpOQXJZVGxDYUFLaGxOOHNrbkRpRkZ4YkZhUGs5MmcKK0FVNzFj +cmVQTkFnRnBITkxnekxBRFJLOWN5alNEd2Q0ek1vRmRqazdqZwotPiBSfHUwQTt5 +LWdyZWFzZSBzcnw7dAo5ZlFCK1E3RmtuaDlqMHZBWWFRQWJaZ2hFRVlQdE9mZnAr +eHA4cERuUks0S29tY0d2QVZBZ2FEOHBXYzJlUnpZCkpWR3F4UGhxeW5IcWl3Ci0t +LSB5YlVuKzc2SzZqYTgwcU9jZS9OZjBqTFhiMjRYVUQ5WDE3dFVzQlhVenNRCt3S +kHMr0SFZeFcjGVHtBCT+cmZOghT8Khx+OloKwRQGbDAAtAOPYMNtvmDQ3PI3Z7DZ +Mg07Ls4cZ5N5IXMp6NHToQflQS/4o8QPozpFh1OlWCAqzCBPDhNp2E3YkQ== -----END AGE ENCRYPTED FILE-----
diff --git a/secrets/hector/mail/password-gts-zuggeschmack.de.age b/secrets/hector/mail/password-gts-zuggeschmack.de.age @@ -0,0 +1,13 @@ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBYUWg5RWY2M0tLUjdCTndJ +eDRHRDZyUXZvaVNzbWdxZjR3S1NLQTc5a1FnCkVZc2dhNG9EOUpVZ1E3YWFKQnA2 +ZFUzdTlBdXVaNjZlL2x5NWduOWxHTnMKLT4gc3NoLWVkMjU1MTkgeWFMSFNRIHBH +Z0RzQW9GWWRXbDVhQjQ0MlJjaUtIR1ZaTmlWZ0dSRkpjc2k0US9rMm8KMy9sWEh4 +OUpxTGQ0Z2FHNkF1Ty8xV1dhZVc5UnEzSm1odVBFYUdBWWhkbwotPiAhU2tpO0tv +IS1ncmVhc2UKcGt2TGg5UCtTY0ZjWm5FV0llMTFnanZBRHZVZC9Ld2cvTlZCZm1S +MHdSZTBSRHBMVk5XRjFoYzQ3T0wrWnFMUwozWEZNTXFldlFiTFFub2loTmRBMmlo +RWszenFVRWhUV01GMU9odwotLS0gKzBualZxdzZFb0h0dVV3WSt0V3ljSUx4aUVl +ZDRUSElNZlpxT1MvYnhZOAqNAXrwSdiOz5wJ4UZpfg9SBBviY7buXrBCjK5Jntca +U8CbXTQ4Kj0nmx8zm0jiFESlsrgPdwXdPdR68Z5OpJNA+XSmHaXFLUqherJziErn +tTb7aubvk59A7Fe/cE8= +-----END AGE ENCRYPTED FILE-----
diff --git a/secrets/secrets.nix b/secrets/secrets.nix @@ -87,6 +87,7 @@ in { "hector/mail/password-katja-ctu.cx.age".publicKeys = [ main-key hector ]; "hector/mail/password-gts-ctu.cx.age".publicKeys = [ main-key hector ]; + "hector/mail/password-gts-zuggeschmack.de.age".publicKeys = [ main-key hector ]; "hector/mail/password-vaultwarden-ctu.cx.age".publicKeys = [ main-key hector ]; "hector/mail/password-mail-zug.network.age".publicKeys = [ main-key hector ];