commit 00585290749d5333c5fce1ad7c385f8f7f16685f
parent 427d6fc64a613343056dd8dec9a24dbd3fd19312
Author: Katja (ctucx) <git@ctu.cx>
Date: Tue, 3 Dec 2024 07:37:16 +0100
parent 427d6fc64a613343056dd8dec9a24dbd3fd19312
Author: Katja (ctucx) <git@ctu.cx>
Date: Tue, 3 Dec 2024 07:37:16 +0100
machines/trabbi/websites: move `things.ctu.cx` to `hector`
7 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/machines/hector/default.nix b/machines/hector/default.nix @@ -19,6 +19,8 @@ ./vaultwarden.nix ./syncthing.nix + + ./websites ./grocy.nix ];
diff --git a/machines/hector/websites/default.nix b/machines/hector/websites/default.nix @@ -0,0 +1,9 @@ +{ ... }: + +{ + + imports = [ + ./things.ctu.cx.nix + ]; + +}
diff --git a/machines/trabbi/websites/things.ctu.cx.nix b/machines/hector/websites/things.ctu.cx.nix
diff --git a/machines/trabbi/websites/default.nix b/machines/trabbi/websites/default.nix @@ -5,7 +5,6 @@ imports = [ ./ctu.cx.nix ./bikemap.ctu.cx.nix - ./things.ctu.cx.nix ]; }
diff --git a/secrets/hector/restic/ctucx-things.age b/secrets/hector/restic/ctucx-things.age @@ -0,0 +1,12 @@ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBWRXlqWkQzQ09hVHVjemla +WmpIaWVaS21lYXA4T25xa2hONVFDQ0tVZjFFCk5BQnY1VWJGYmZDOHlhVnFEY2c1 +UHpuci9oNlRuam1LTUVHNzFESmV3L3cKLT4gc3NoLWVkMjU1MTkgeWFMSFNRIHpO +K3VDRUVndHp0dnlGTFdIbTlNR0xWcmw0SU9oRXR0a3NhbGhjVTRDeEUKcURUbFhE +by90SEVubU1rRUhKK1kyQkE4U3B3VVVIUFNXaVFJeEsxNFBWMAotPiAjLWdyZWFz +ZSBEWGNCPl5nawpiSDY5bUdIZUJwTWxJMktEWWVtWmVmMVhvN0lneElvWXl1TzBC +VEJGQURtWjRqL2JYZm0zSXBBCi0tLSBDcHZtM2pTbHJpNFhyRDg2ZUovQ0loTzUw +WHJjbnpIZkMrUE9TaTFpeGo4CjgsRbhemea4uaQxbwupDR7A0yiR0X0VnpybisnM +nOxjdwy3/rA1ADzS/Az4N1xgux08hpGkoVi60hDyiFLTC9b7UKcHfS12GpUXMZPA +n05MLDhDLJu+Z6b8e1eGCQoPdg== +-----END AGE ENCRYPTED FILE-----
diff --git a/secrets/secrets.nix b/secrets/secrets.nix @@ -69,7 +69,6 @@ in { "trabbi/restic/mail.age".publicKeys = [ main-key trabbi ]; "trabbi/restic/matrix-synapse.age".publicKeys = [ main-key trabbi ]; - "trabbi/restic/ctucx-things.age".publicKeys = [ main-key trabbi ]; "trabbi/restic/gitolite.age".publicKeys = [ main-key trabbi ]; "trabbi/restic/gotosocial.age".publicKeys = [ main-key trabbi ]; @@ -92,6 +91,7 @@ in { "hector/restic/radicale.age".publicKeys = [ main-key hector ]; "hector/restic/vaultwarden.age".publicKeys = [ main-key hector ]; + "hector/restic/ctucx-things.age".publicKeys = [ main-key hector ]; "hector/syncthing/key.age".publicKeys = [ main-key hector ]; "hector/syncthing/cert.age".publicKeys = [ main-key hector ];
diff --git a/secrets/trabbi/restic/ctucx-things.age b/secrets/trabbi/restic/ctucx-things.age @@ -1,13 +0,0 @@ ------BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJMGw3T3ppclBzeUFScXNR -ZC82R0FVbmo3TlZpWkl2cktkSDZKYmgzQkRJCkJYN1UwSnVocWF3bHpyOXJzVHpY -Q0hwa2IyWE45R0gyMFdsWXR5eGpLa3MKLT4gc3NoLWVkMjU1MTkgcThvY3pnIHQv -eDVybGxiNHlZRVU1anpsbkcvRkFiNVM3TFNoZGN0L0NTaWVOTzhDU00KT0JIMzJl -YU55NDBMdlQrQXNxaFFCZ1dnN3JVeUJodDBtbElXaXRUYlNRUQotPiAyRjZbay1n -cmVhc2UgYXggeEVRClVQNFJoOE1Dd3EzOHZ4SkRpS2U0N3BEQ0N0alRhbWFXQnVJ -eDdLcWFFbUt3clhIS1l4REdiKzI3aVNSQnNRRzUKK2tIeTREZzU4VkNEU1Vpazg5 -eERiNlcxQWg1WQotLS0gWmV3WEhRakhVQk9tWXNpaUxGcnpTTktnTUZNbmFmT1JG -RGdSTWdkL1pLVQq4F2I7xe8JOK+phCdvv1rCGqXsK/P8VZFf2hSj52ozT1kPoUSV -KJg7+DHUM2V/nFOwtSCHuaabS3jt2qAHFx3NigKkptHv0rGbU9Jfkhz8Q8OEfWnV -4UpITSm1nkkcO48= ------END AGE ENCRYPTED FILE-----