commit 032fd98d74c0b3a8268e8c2126e852aa88e86467
parent 1d6a4bf56774c60a679fea02e0fccadd92e9fb6f
Author: Katja (ctucx) <git@ctu.cx>
Date: Fri, 25 Apr 2025 12:10:56 +0200
parent 1d6a4bf56774c60a679fea02e0fccadd92e9fb6f
Author: Katja (ctucx) <git@ctu.cx>
Date: Fri, 25 Apr 2025 12:10:56 +0200
nodes/hector: move mailserver to `rabbit`
17 files changed, 79 insertions(+), 80 deletions(-)
diff --git a/configurations/nixos/websites/fedi.ctu.cx.nix b/configurations/nixos/websites/fedi.ctu.cx.nix @@ -40,7 +40,7 @@ media-remote-cache-days = 3; media-cleanup-from = "01:00"; - smtp-host = "hector.ctu.cx"; + smtp-host = "rabbit.infra.katja.wtf"; smtp-port = 587; smtp-username = "gts@ctu.cx"; smtp-from = "gts@ctu.cx";
diff --git a/configurations/nixos/websites/vault.katja.wtf.nix b/configurations/nixos/websites/vault.katja.wtf.nix @@ -33,7 +33,7 @@ PUSH_ENABLED = true; - SMTP_HOST = "hector.ctu.cx"; + SMTP_HOST = "rabbit.infra.katja.wtf"; SMTP_FROM = "vaultwarden@ctu.cx"; SMTP_USERNAME = "vaultwarden@ctu.cx"; SMTP_PORT = 587;
diff --git a/configurations/nixos/websites/zuggeschmack.de.nix b/configurations/nixos/websites/zuggeschmack.de.nix @@ -40,7 +40,7 @@ media-remote-cache-days = 3; media-cleanup-from = "01:00"; - smtp-host = "hector.ctu.cx"; + smtp-host = "rabbit.infra.katja.wtf"; smtp-port = 587; smtp-username = "gts@zuggeschmack.de"; smtp-from = "gts@zuggeschmack.de";
diff --git a/nodes/hector/default.nix b/nodes/hector/default.nix @@ -32,9 +32,6 @@ # git server (gitolite+stagit) ctucxConfig.websites."git.ctu.cx" - # mailserver - ctucxConfig.services.mailserver - # matrix-bridges ctucxConfig.services.matrixBridges.mautrix-signal ctucxConfig.services.matrixBridges.mautrix-whatsapp
diff --git a/nodes/rabbit/default.nix b/nodes/rabbit/default.nix @@ -39,6 +39,9 @@ # password-store (vaultwarden) ctucxConfig.websites."vault.katja.wtf" + # mailserver + ctucxConfig.services.mailserver + # fediverse server (gotosocial) ctucxConfig.websites."fedi.ctu.cx"
diff --git a/secrets/hector/mail/password-gts-ctu.cx.age b/secrets/hector/mail/password-gts-ctu.cx.age @@ -1,12 +0,0 @@ ------BEGIN AGE ENCRYPTED FILE----- -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 @@ -1,13 +0,0 @@ ------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/hector/mail/password-info-zuggeschmack.de.age b/secrets/hector/mail/password-info-zuggeschmack.de.age @@ -1,13 +0,0 @@ ------BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBRMzN2U01nSzNveENzbmRH -Ung0T0xza3gxYndCT2pEbzcrTWZMd2xtQ1ZJCkljclZ2aExYbVAzNUNybUpNTnc3 -R3Q4YTBtbTY0UXY1OWpnaE1tRTBPTk0KLT4gc3NoLWVkMjU1MTkgeWFMSFNRIENu -UWQvSWFKRzM4Y2VoVldmSTdpUG8vdWd6WWRQWHcvbHZ3cmxxOG0vRUEKSm1YU1V0 -Z2JhRDhhRlJvZFNTaVRSMnM1cDNpSDNla0xLSFVXVE5yL1gwZwotPiBTbyxKLWdy -ZWFzZSBXUHFcO2RbIGBbVk1dIFJdJlN1KlBpICxVRgpJUEpZWEpoQi8wd2hjdmFp -WTl5cVNqbTJDYmxpZjkydUNmSy9tV0duam1NcFNrYThySngyazFyYmtzb3JIMVBl -ClVRCi0tLSBsSlpRc1RCODNyOVRYZ0dyTXYxS1hFVUNKK0JEdDZ1NWJPZmZneFc4 -QXlrClyzg4mTdpJd6p+CEU4IBmSOX0ZOvqkf5EN8cDZqnGgGqPFAlptaO7w5njsc -F9zCoNjoHJ2f+WfikMFDs/thgm6FH7mpNEM3Wj5cAwUF6PR5FUUjOVWmw3tEo6pq -ng== ------END AGE ENCRYPTED FILE-----
diff --git a/secrets/hector/mail/password-katja-ctu.cx.age b/secrets/hector/mail/password-katja-ctu.cx.age @@ -1,12 +0,0 @@ ------BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1TlVUemU4V1EzMUZWbGYx -Y0dUVnpSQnQvZjc2Tm9Cb3FtZUc1N3VlTms0CnNLbWJtMHcyMkE2QlRJVnZmWnZW -a2RvNEN3MXYxdmlKR0ZyVUt1cnBEZGsKLT4gc3NoLWVkMjU1MTkgeWFMSFNRICtE -M2s3WHAwUXlEcWxaOW4yblAvREo4NU8vVE5PSG1JSHJoaWdHYTF2MVUKSFN1MUh3 -VlEvU1RtU1lDY0I0Q3RnN2xZempuZEJFWERjM1BlYkk1YXpvMAotPiBgOC1ncmVh -c2UgLWJWU1MlICk3Q2toW0kKQ24zNHNxWGV6YTh1cDFKblRFeWtYT1BlcUhSbHVQ -cXlTVnpSUkIzYXFONAotLS0gRzBnUnVWcDBPc1Y0bVRQYXJNTFVGYWI0MW04eWov -K2hBNlRNZ0RyMzFkbwpNMv/TrvIDXiRcnEC8VdGlg9EreubYvMXKXxGshnKd9X7q -yitoBnEW9zWdOm9QTOZOPA9JibrUdUkCRIpqc6Iwd4nfRUZmvSg2p69UXLiqDeFj -/ieFPlbPkuguip0= ------END AGE ENCRYPTED FILE-----
diff --git a/secrets/hector/mail/password-vaultwarden-ctu.cx.age b/secrets/hector/mail/password-vaultwarden-ctu.cx.age @@ -1,13 +0,0 @@ ------BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOc2Qrc3RnRHVwZ0xONGZ2 -VHpaWGQ3cEd0NEpmMHd0NjNORjNvM3ZQcjB3CmZrWkhrektUSkxNOEYwWUd0TTBV -OGVvZEpiMnJVOUZUVlFxY091VUdUYkkKLT4gc3NoLWVkMjU1MTkgeWFMSFNRIHNS -VVFiRDN0Z3NHMkdGbjNIVHRBRUhhaXpPVUFKdkFkQXVRWHVSQnBoZ3cKM0ZmR2ha -YzAxMm9haDRISVJkK3dhMmZjM2RNTGV4K2s1em92eUxoaGYxSQotPiBuLWdyZWFz -ZSAtQSBDO1ZuYklKQSByJiAzCnl5QTFDaEttNTVsTUl1K1Bhc1YxcGQwZlM4c3Ri -Z1FxZHRDMURKczJsMUIwdE41cUlaaEt3VXA0eUVSbXB6aUIKclZINUF3bEdtdGVr -TlF1YWJNclVpY3Npdmo0U01ZVUFyWE90V0lOR01qMAotLS0gV083RFdIY3hsbC94 -Ym9pN2ovMHIwYzcvT2c1d1haeEMxb0lBOUJENmM0bwrRovMShR3Aubv6bih+chjy -QMK+BZXolpwf8Lq/B+/a8Xnptc/YpQXDOcWBQ338hUzs3u3FY+xmuG8WPoKUvzeL -iuGkV6oE7Ibe1+72iAgWWEH3h1a0Iu/dhNZrPw== ------END AGE ENCRYPTED FILE-----
diff --git a/secrets/hector/restic/mail.age b/secrets/hector/restic/mail.age @@ -1,11 +0,0 @@ ------BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpU0VLVzFMYnozYVJLNGFI -ZE9IU2w2RXRZNDFnai8yYis5UnliV0N1eWxJCkY5a3BVYWUyRVVMZ2tqd0MyY0JE -SmJyY2FTditrR0dKR3ViNTZkTDFKWTQKLT4gc3NoLWVkMjU1MTkgeWFMSFNRIGJV -bVN4UU5oN3JKNVZWVVdDWEE5VUtJeTRuZ0g0enVuNDBwbGFiUlFuMjQKRkFJcldi -U1J4TEUrUTBVemt1cmdnUUhkL3RPOXdYUEpjSTdvaUpaYWNTTQotPiBWImZfeHFR -aS1ncmVhc2UKRGJ2SkcyK2xGL2xraE1Tc1RoVE5pQTRWcmsxbEpuMmxINmdJQnkz -YllsUnN1dy9GZUpEbzVXZ3d4UWtBeHBMMwpoQQotLS0gZjZEdmRwNnduM2pSSVFK -QnhUbDJKWTljcHBXaDVQSVdmZGhLc2dZZzRISQpwLsX9aJGiuAlj7LJq0fqNaWMP -PjBTxajmpCTbLnnLEvICiNLxnDJ79ZIxqXFSali/CDVUCLcMFfob9MsPbW7zFA== ------END AGE ENCRYPTED FILE-----
diff --git a/secrets/rabbit/mail/password-gts-ctu.cx.age b/secrets/rabbit/mail/password-gts-ctu.cx.age @@ -0,0 +1,13 @@ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNbXhTWVprMkV1Zy9TeFFE +K2lzWFlRSCt0dmorN0NsUy83UkRzK2NaUG1JClliU1JFa3FIR0dQdzFvVVhVOUZ4 +ZWp1bzFYOGtWdzQwT0FXb3h2M25WVzAKLT4gc3NoLWVkMjU1MTkgaGtMdUVnIGNq +VytyaTB2YUw4MTQydzRCTTVNNTFzZVEzeHZTbWdOazFkVEFoL000UzgKSVdNVkFQ +OXhldXlwcmJOQ0ZoZE9BYmttR3JQNSsvencxZjdpS29LbW1uYwotPiA5TTw7TyQ6 +TS1ncmVhc2UgKnBqI3oKYWxPa0NmUkJPbnNzZFUzZ3RHRkJQUWpqQ3kvdUZNem5z +Y0hrcTJSRk1TMmd0THUzWEZnNGNiWUgwVVJ0TUswdwprOTBmenJGeFlRL1NuZmdO +SlhQclJ4TWdGcjl0VERMeGs2YmlKcWZGZnRBTTVKZ1VTUQotLS0gNzFCMmFKaWJ6 +TlRyQUo0Vm43cjNxYUJUamZFZnY0ZkpENWFJd1pNMUhKOAo/lBMolEh2ncl/iS68 +vWSg8FriKIuvJlncCFtITxqK8r/RwVZ9MZGacXQXFeHkv9A/v1AwBia4MWxnx3P0 +IE0fQI83RXSTAUw9oTO3NBneEoTz/Pg/4LphWTzebYU= +-----END AGE ENCRYPTED FILE-----
diff --git a/secrets/rabbit/mail/password-gts-zuggeschmack.de.age b/secrets/rabbit/mail/password-gts-zuggeschmack.de.age @@ -0,0 +1,11 @@ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGWkpMS2ZDK2FjeXdHNnR5 +aTlGbndmMnR5U2NhRThySlNqUXl1MHAvQ3pZCnhSZzZHRC8xRXpRYmkvaEdEUTJu +RmExUDEyVWxNYlBtaGFEZlppSHBkbGsKLT4gc3NoLWVkMjU1MTkgaGtMdUVnIFFO +WHJsK1oyK3VVVGEwaDdTVW1NbGFvS21idGk0YnRTT21IVkM2OHl6M0EKYkN1K3Nu +Tk95dGQxNTM2VDJYdk1qd3pFeWo3YnNRMmtFTk9wc1VTNmx1QQotPiBFd2tXTiwt +Z3JlYXNlIGFzJS1hIHRAdTZpVykiClM1R2xkMmcKLS0tIGgwa1JlYUpWUncrUGt3 +MVdyZ29aTTBxdWxyQWp1WSs2Q0lGdGdwdDNWZE0KMd7t+NyTjmHGgWwiXTkQEjZx +66MQVx9jMOOkPGbj9nfa+A25FaJ6BsCs8lX+CzVPriV9z1tJnw1cRfhWcHQ+8+Ii +HRLUvovCG9nlnuZtXCa+PZA+K78ElI6WsVMr +-----END AGE ENCRYPTED FILE-----
diff --git a/secrets/rabbit/mail/password-info-zuggeschmack.de.age b/secrets/rabbit/mail/password-info-zuggeschmack.de.age @@ -0,0 +1,12 @@ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBkZ2REUzZoMWxnL3NMQTVs +dktPdjJKWDNsbTQrL0Fscmp0ckxuK0xEZVcwCmRVYVVEVzcvL0pvNy92KzRIanVL +eFloVmlSNldhL25rZUZ2WFJBbmkrWW8KLT4gc3NoLWVkMjU1MTkgaGtMdUVnIFFq +bTd1ckVJRzk0ZkRnVXozOTF3UDgrUW1ES1YyOXdkTURPTDBUNEpDMVUKb1Uxb0JJ +TnU2OE5VLzRzaTZvb3EvdWJwM0J3ZHJiNHBXVFVQd3YzVGU4WQotPiBvdDJjOjUw +VS1ncmVhc2UgZjNDKChuICVgTkgrLCBVS1pQKy4KQlNhTjhwcGdqclhlN21sNzFs +T1lQTlVSZkZtV2NjWHNhSFJTCi0tLSAzZ0RpVDVOMVpiMFhaVWJwVjZkZ1lFQWRL +THhwdkpwN0YwL0FqaGZycnNJCozCBBm9i94NUycaLE/5IOvztWkSRuGlyyTp1zqs +Hh6CwvxuzW73qMMkh0jQ3Kh8mDHe7A6GoYb8dt92oBYNAfxcVozzp2qcTsyrOP36 +PLAzN/FwZbrG+8gm6TZx9Q== +-----END AGE ENCRYPTED FILE-----
diff --git a/secrets/rabbit/mail/password-katja-ctu.cx.age b/secrets/rabbit/mail/password-katja-ctu.cx.age @@ -0,0 +1,13 @@ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBhN2hVa2pGeUJmTzFWUXdH +K1QySE5JZUNSVE15Y1UySjZwWEhBdStuMDFvCjB6OXU4Zm9TN0w0MmJLWHl4OWd2 +Yys4b2lLRGdwdUNRYVNXOU0wZkIvd00KLT4gc3NoLWVkMjU1MTkgaGtMdUVnIEl6 +QU8wM0liOUgrWDdZWTg5R1NtYXFIeDlYdXVDbjE2Y3hvMzVRSDVBQXMKV1VCcFgv +aGFvcW5QQUhOaEpyTWZTYWNkV0M4eFVRdEhGREZwQ2pQLzloZwotPiAlQ3stZ3Jl +YXNlIHEgYXdoPkoKRXBHRjljQlJqWVZweDlTdlVqcFNPOFVxbEVPZTUvdHJPUWpD +cXAwbmpmODN6SjE1WWNWMU5xcE5wRjBJenhPbApsekZOaHM5ekJLa3pma2RmV2FS +Sy9ZNjQrTTZEeDQ4K09LTkhiMzhpdlEKLS0tIE9hbjlNaUs0TEVENFpqN0xqcFh6 +cmVmMitlUWJlL0tvLzRBdzVINEpvaHcKyC9l7iMFWYb25F0PtyoFpZeQhBaTqv/k +i5iEtZzYhVLUNabuHbpqekUN0HY4ryetY+m/3f0MKQEql2J8yYn6W+JVDooDW+VQ +lHZScuWhNKZbUrx6Oekfv0lf66+5 +-----END AGE ENCRYPTED FILE-----
diff --git a/secrets/rabbit/mail/password-vaultwarden-ctu.cx.age b/secrets/rabbit/mail/password-vaultwarden-ctu.cx.age @@ -0,0 +1,13 @@ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNY1VEdTVDRHBHdVR4TzdQ +WEIwaGJhSVhCODZhOGdoTHZ0bndnaERRajNZCm1EaE93ZHJIYm1BQ0l3bU5VcHZj +MVBka3pidVFqbUs2aFFEYllQaTg1d0UKLT4gc3NoLWVkMjU1MTkgaGtMdUVnIDlk +SUV1cW5HQ1g1Y0dVbDZybDNtdmZ3WWdJSVA2ZXlCdWJ2MFRSb2FKUmsKb29JODZq +djhCcUdTNHowOGFic1REcFdScm50bmtzVlpiWFh0RXdkbG16MAotPiBibXUtZ3Jl +YXNlIF1vJkF7IDlQSiBaCkpKQk5mSzE0dnNka09KcE9JM2U3UHpZZk1GKys0OG0v +SzAwSURyTytJMHZ6NlhDMG50QXlqbXMwMXVrTzRObVYKQTVBV1A3b08rTjZVKzVF +ZEJPVG85bnZiRXpkbkIyaXdESGNiaXlTSlNlM1pwcU0KLS0tIFErV2dnM0MyR3ZJ +Ukt3STdoaHk1Z2VKNHFpQ3QwcGNHVUhUdVNJYWIrOU0KE2rDb+Vv6ibWRI4tDuEA +sFCxXEk3S+GNVQXVFDcvdpqT9ZzCKyMCBDHcE8ZWQf0KwfSfknni9HlF9T0so+EI +g3i8xNq+XdKW9JIzNbAAhMK/POKdLOIvYatUGRU= +-----END AGE ENCRYPTED FILE-----
diff --git a/secrets/rabbit/restic/mail.age b/secrets/rabbit/restic/mail.age @@ -0,0 +1,11 @@ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2RzRqR1ZmanM5NEdJNm0w +YnMxT203eG1DbzFlaUNGVDl2bjJzNytRaldBCmlNOWc4aXBURU5hdGJWN0NOSFA5 +WnBnRElYS3AwK2hFZHJuMHFTWjBXTk0KLT4gc3NoLWVkMjU1MTkgaGtMdUVnIHND +YTV5QmNWRmkxQXRUeHBkdEZ5TlhzSGR3ZVRQenFVc3dERWl5ZFlLWDQKLzBtcE00 +ZnJVeU9VY3NEVGdkSy85VnBSdnhCcEx1cU5NSmZsUW5veVhvdwotPiBNSy1ncmVh +c2UgXGs1KCxyagpxQVBTVlpaaTNhUVRla1lPU2lKdXUyYlMyTE10TnUrUmhMTWp5 +enErcUxoUzlkSHVpcDAKLS0tIElINlFiNnh1cDg0aHNLdXh2anROcjBKa0Q3Mnkr +MUlJa1Y2SGlTVklrVUUKVBloTObRLOVPucMCP8LbIaQPHmvFPotlDL5AJlew+HPz +RiHeB/6HjialIzXe+idrQiBrGhvXX0vLwmq33H8niUc= +-----END AGE ENCRYPTED FILE-----