commit 72e8e215b99aae7682a74fd7ac0cf1a07fc09bb2
parent 5d63d8f14f1d2ffb300e6ba5d963bec34fa444d3
Author: Katja (ctucx) <git@ctu.cx>
Date: Thu, 24 Apr 2025 19:56:54 +0200
parent 5d63d8f14f1d2ffb300e6ba5d963bec34fa444d3
Author: Katja (ctucx) <git@ctu.cx>
Date: Thu, 24 Apr 2025 19:56:54 +0200
configurations/nixos/websites: move `fedi.ctu.cx`, `matrix.ctu.cx` and `ctu.cx` to node `rabbit`
8 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/nodes/hector/default.nix b/nodes/hector/default.nix @@ -26,7 +26,6 @@ ctucxConfig.services.syncthingNginx # website / webservices - ctucxConfig.websites."ctu.cx" ctucxConfig.websites."bikemap.ctu.cx" # cal-/card-dav server (radicale) @@ -38,15 +37,9 @@ # git server (gitolite+stagit) ctucxConfig.websites."git.ctu.cx" - # fediverse server (gotosocial) - ctucxConfig.websites."fedi.ctu.cx" - # mailserver ctucxConfig.services.mailserver - # matrix server - ctucxConfig.websites."matrix.ctu.cx" - # matrix-bridges ctucxConfig.services.matrixBridges.mautrix-signal ctucxConfig.services.matrixBridges.mautrix-whatsapp
diff --git a/nodes/rabbit/default.nix b/nodes/rabbit/default.nix @@ -29,8 +29,15 @@ ctucxConfig.websites."grafana.infra.katja.wtf" # website / webservices + ctucxConfig.websites."ctu.cx" ctucxConfig.websites."oeffi.katja.wtf" ctucxConfig.websites."things.katja.wtf" + + # fediverse server (gotosocial) + ctucxConfig.websites."fedi.ctu.cx" + + # matrix server (grapevine) + ctucxConfig.websites."matrix.ctu.cx" ]; home-manager.users.katja.imports = [
diff --git a/secrets/hector/gotosocialEnv.age b/secrets/hector/gotosocialEnv.age @@ -1,11 +0,0 @@ ------BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBRMXN4T3Nwd0hDcTI5ZlBk -YldtMmVScng3V3lIZGxxQmdxbUxDaEJKTGtjCnA1OWNJOE9JU1BuSGVubEdjam1O -TjI4bWFaOEg2UFM5VXJrR3lVazlvMUUKLT4gc3NoLWVkMjU1MTkgeWFMSFNRIDNS -dXdyazVUbTJjRlR1Q2Z4V2R3WUtGRXBCZW1Ic3pNRGIxWk4xTU1MeDQKbW93Y2pK -QjIyQjh1YnJ2MktIVU5lTW5xSGw0aXZ3dGpXMk9kdVZna2k5MAotPiBHcD1qRGpm -LWdyZWFzZSBLXGkgaGpbVQpJWnlGVnIvRlpTRDgKLS0tIDVadE8wVVhIWjZPMGFr -VUJ1Z0Q5bWdUQ3JsZ21DRTBNWXNINm0yTytxQkUKVNDBP89fGael4QpbLouXSZzu -aWW35KYyYwCS5v3Hb+MbsIbrjjSEWZA5K3aN/zXWg0ENWesKt0z6qxUcgHD32vAy -W6A1 ------END AGE ENCRYPTED FILE-----
diff --git a/secrets/hector/restic/gotosocial.age b/secrets/hector/restic/gotosocial.age @@ -1,13 +0,0 @@ ------BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB0VVFpaUQxWUpVU0crNCtk -eHRySVljTGtWSW81SDAyNUphVDl0d3N5NEJVCnZlTDl4V3FKYllPRjRXdUJsMndz -aTdnUXJGTWp0aERVeHdKTGFYVFkwOVEKLT4gc3NoLWVkMjU1MTkgeWFMSFNRIHlL -bXZHS3N2UjlSV3BFUzA0eklEcWl4QVpWb0tzenZQajQvdnMyL1VGZ00Ka2F6UVhn -c0hsb2tKZCtUbzM5aHZNRkh5RWpINzY1SmJWQzJDUHdLY09zQQotPiBLLS4nLWdy -ZWFzZSBaL3gtIEcoKE5OPyB4Ii9EUCZ7IiB7TlF8QyMydQpPcUdZMFFpSEkrZ0hj -TjZ6WGVMVDcvVGVBR29DK01GdUNBVHJaalBDazJHSW11OTZ0cmRabC9YNEpOVkQ4 -czVlCkxQWGs1V0tFVmxTeTNUNDF4cUJaaHdGaExSNDlSYkkKLS0tIGV2THVLQ1E0 -TWNVb0o5WVpobm1IUUh3ZWdxVzcrTG1MNzNSeCtxUm1iejgK4WSlQEbu27/G0zzN -Cz+hoZ2CfKxQ9WwKb6P7ctNCYs4GmtnhYeEa9zQfzeeeARB1/bZdJ+keyal1nnkA -hxCTlKU= ------END AGE ENCRYPTED FILE-----
diff --git a/secrets/hector/restic/grapevine.age b/secrets/hector/restic/grapevine.age @@ -1,12 +0,0 @@ ------BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBSbXhKNitOZlp6WlZFWVlZ -aXBmK3Jpc2pOYnY4NE5TM2szejRoaGdYY1NNCjRtOVhRY1Z4aHUvdHlQNFpVNHlW -R1IrQWs2N1MyaEUvelNYUGNQR0d0dlEKLT4gc3NoLWVkMjU1MTkgeWFMSFNRIEdX -UXBsSkRhbWlacWxsTFJFejJOdS9DSEM3dnYyT1E3cExNSXc3NGM5azgKdzJLMU8x -RENOQWg2bms0MjB6VXdHOW16ZytVVk94alVaeTMyZ2gzTUpnNAotPiBJPz9VWS1n -cmVhc2UgRD4tWVggSSUgPk5KPQp5aGdKblNqR3R1ZlJreDhZV0lEQVRUeHdmRGlK -Y1M0TTdxbHA3UHdTODRKZEdRZE45QXF0WHp2UFRVUStLY3hCCkpxc2VBYVJwcVZh -cwotLS0ga1RqY0dFNkdJRHdVRkJ0cnhmSUlVczgrTUNTbm1QR2VIdDJsTzByN2xG -bwrYnXbuOZgjKb6dVtirxC03MUw8XyyY8Bort0famAd6Jc4Wfj2kDyyVJJtuRxzd -sSncbWGo2OG6f0oBiBg= ------END AGE ENCRYPTED FILE-----
diff --git a/secrets/rabbit/gotosocialEnv.age b/secrets/rabbit/gotosocialEnv.age @@ -0,0 +1,12 @@ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArYkZwV2hwSTZXemxPN1ZC +eHRqRC9mQm5qcVMzSTRKT0FUd2NMZmEzN2gwCjNLU1J3bW1RbytxK0dqclBVVDRY +UnlmU1JCYzl1UlpqYVVqZG40WlJDTzQKLT4gc3NoLWVkMjU1MTkgaGtMdUVnIC8y +eU9UV3pFV2ZJYkZlU2c0YVJDNDBQS3Rnbi95M3E1SXBSVGV3RTFmWFEKckYwZlVW +SXJuRWRIdkcxZXQxaWViR2pzaG5odlF0NHVqOFNwU01nQnlnbwotPiBySFVnLWdy +ZWFzZSAoeEhzdyA4My0tdiAmTDVjR20gT0xMVjEKTi9lL1JVaHh6WFRrMGQySkl2 +blFyTVNHQzZTNG1IekIvVUs0Z0FBemdKa3JQZwotLS0gUXhEcXMvNW51Z1paVmox +VFI2R0FPSzdWKzhrOWorWmdiMzZRd2pUZEY3OApgGfVRpvU83Hhcb32jFZ1p8LRp +DPWQdqJDu9Vw4jlT8IYeP+NiPPKAlli6sMsT0uPk68ZBgxCDkro7LEwB+58b0pTY +sbw= +-----END AGE ENCRYPTED FILE-----
diff --git a/secrets/rabbit/restic/gotosocial.age b/secrets/rabbit/restic/gotosocial.age @@ -0,0 +1,12 @@ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB3dS9kampjSDFuMXhwcEt6 +RVl6VHRMemJjL3daUGNFK3lRL21YRG5UU2k4CjNRa0ZDRzFRbnE1ZXlZMUVwbUg1 +MjBwaVFIaWxhbWpKSzY5L044ZUtLS3MKLT4gc3NoLWVkMjU1MTkgaGtMdUVnIDBW +blZ0TkQ5MnFzWURkdHpWZXRMSWZMWFB1YWQ2UGR6QmxQTnF4M0g3Q1UKb3VtTW1E +N29aa2dJQVM4ZVp0NzdjVjdKNmZkcWw1M3B0TERyN3ZDWFhabwotPiBANi0sei1n +cmVhc2UgS35VQCxOIFQlRlA/XiA8TyAzLkhQd0VsCjlHZS8vN2hEdTdMK3VPYldX +STVDWmdxdTNyWnozSnhtR1g1eUU4b1JVWDlRcmloaUNjVnVLRElRNmhOaGkraFQK +ZTN0WTJSZGw2bWRtazh2NVdBZG9wVnpFdmszZAotLS0gTkRoMHlyUEFHNEFlTW5W +NzlhVzY4QzVWWWUzT3FrYm5hbEJlL1p0eXAzQQo5NBj2qfnIlDOZiy+tPNi3y/nP +HvkCuTYYXcI9tWVFg9uOBTmZyMgU+wi2u2bKH/MU8ojTLw6DYqEbcatMP1jfLQ== +-----END AGE ENCRYPTED FILE-----
diff --git a/secrets/rabbit/restic/grapevine.age b/secrets/rabbit/restic/grapevine.age @@ -0,0 +1,12 @@ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBRcnltREVjSVVOMER0ajlX +TVI3TFY5VnZnVGN0SllJMkxVaXo1d2UxaUhVCk5SaEdsQWFad0pOc1pBTWo0R0JD +SnVHaVQ0MzhtcTJONUlXWDVtOGgxbVUKLT4gc3NoLWVkMjU1MTkgaGtMdUVnIGxh +ek5CdkZ5RUVaeGZmdlJiWDdwWFZuRmlwRmt3c2hsNjRteFU2eFVVMkUKcFpUczgx +NUxSam81ZlhpLzQ0UTNjdmNVWTBHWXpvdk91dFdtZGIzZ0JCTQotPiBXLWdyZWFz +ZSBRICYnIENpYApvbk5rWEprenBIampnM3h4dVQwcHpseCt1MTg0WGlLVDhpb1RG +cFlNMi9qZHJvOEorYi82bFZlbWJwWU9oc1orCitJQmZWdnB6c2RNb1pQS3dzVlc3 +WlJDdGR4UFlGSU5nSVQ5TnErbXViZ2MKLS0tIDlOZVJrWUI1WHg5TUxnSkdwRUhy +OFA0dUNlQlF6TEFybFllWlBWaktYVEkKKvSdk9YwG2GSX1CuQgDe/ez+wDgjnWeO +er8cxp6p1saIs4iCzFDgm9c5x6/nNcyAllC2RMvyBg0HjJDm +-----END AGE ENCRYPTED FILE-----