ctucx.git: nixfiles

machines/briefkasten/websites/things.home.ctu.cx: move to machine `trabbi`

diff --git a/machines/briefkasten/websites/default.nix b/machines/briefkasten/websites/default.nix
@@ -5,7 +5,6 @@
   imports = [
     ./wiki.home.ctu.cx.nix
     ./music.home.ctu.cx.nix
-    ./things.home.ctu.cx.nix
 #    ./storage.home.ctu.cx
 
     ./photos.ctu.cx.nix

diff --git a/machines/briefkasten/websites/things.home.ctu.cx.nix b/machines/briefkasten/websites/things.home.ctu.cx.nix
@@ -1,28 +0,0 @@
-{ inputs, config, pkgs, lib, ... }:
-
-{
-
-  imports = [
-    inputs.ctucx-things.nixosModule
-  ];
-
-  dns.zones."ctu.cx".subdomains."things.home".CNAME = lib.mkIf config.networking.usePBBUplink [ "${config.networking.fqdn}." ];
-
-  age.secrets.restic-ctucx-things.file = ./. + "/../../../secrets/${config.networking.hostName}/restic/ctucx-things.age";
-
-  restic-backups.things = {
-    user            = "ctucx-things";
-    passwordFile    = config.age.secrets.restic-ctucx-things.path;
-    paths           = [ "/var/lib/ctucx-things" ];
-  };
-
-  services.ctucx-things = {
-    enable      = true;
-    storagePath = "/var/lib/ctucx-things";
-    nginx.enable     = true;
-    nginx.enableACME = true;
-    nginx.domain     = "things.home.ctu.cx";
-  };
-
-}
-

diff --git a/machines/trabbi/websites/default.nix b/machines/trabbi/websites/default.nix
@@ -5,6 +5,7 @@
   imports = [
     ./ctu.cx.nix
     ./bikemap.ctu.cx.nix
+    ./things.ctu.cx.nix
   ];
 
 }

diff --git a/machines/trabbi/websites/things.ctu.cx.nix b/machines/trabbi/websites/things.ctu.cx.nix
@@ -0,0 +1,28 @@
+{ inputs, config, pkgs, lib, ... }:
+
+{
+
+  imports = [
+    inputs.ctucx-things.nixosModule
+  ];
+
+  dns.zones."ctu.cx".subdomains."things".CNAME = [ "${config.networking.fqdn}." ];
+
+  age.secrets.restic-ctucx-things.file = ./. + "/../../../secrets/${config.networking.hostName}/restic/ctucx-things.age";
+
+  restic-backups.things = {
+    user            = "ctucx-things";
+    passwordFile    = config.age.secrets.restic-ctucx-things.path;
+    paths           = [ "/var/lib/ctucx-things" ];
+  };
+
+  services.ctucx-things = {
+    enable      = true;
+    storagePath = "/var/lib/ctucx-things";
+    nginx.enable     = true;
+    nginx.enableACME = true;
+    nginx.domain     = "things.ctu.cx";
+  };
+
+}
+

diff --git a/secrets/briefkasten/restic/ctucx-things.age b/secrets/briefkasten/restic/ctucx-things.age
@@ -1,13 +0,0 @@
------BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5dS9CVXloMHFvTjV1QlZv
-d3AwcEpHM3ZmNURkaUlsbVRzUGxDRjVoMURnCk1qSkdOVEZSN0w2ZUg5bGhRT2NV
-NWsrUXNsNmN2U0wzZGxLMHJDRWdxdWMKLT4gc3NoLWVkMjU1MTkgNGhLQ013IGtJ
-TW1GUW5pTERvK2wwVnJ4cTUyRkx1RnVYNUIweTFCNHdaaWtKSm9GaUEKaGFZRXd6
-aEVyVEh1SWlKQlhKK2x4Yi9nYmxuWWJDZkpGNXdxMi9VM3g5awotPiArLWdyZWFz
-ZSBYVEpOYHxEIGNlI2d0UGw6ClJCajZueWVQR05UdnA5eFB4QS9lb0U5UlZORlpL
-L1Y2TzZsSXo1RUtESDdDRHZ1cjM4OVZiQ0hqNGVrdkxtVjYKQkxMczBYbUFYa1RM
-WHV5cmUycDgKLS0tIExSc1pPbmFMK2hRYnd3UnFZNUs4MXZtOXg4T0Y2eUdxdGxr
-L0loc0xVNGMKR1wni1wsSz2zABGS2vFm0uK3wVgst76JkfibG8hWXCpnkC0PejUk
-J1qo/s4MnEsMbF7za0vXJdQjaOngHuuPPCVxBveeB3bVEwK17hy2lbUNDaDmtKAW
-puXujgLFlsQb
------END AGE ENCRYPTED FILE-----

diff --git a/secrets/secrets.nix b/secrets/secrets.nix
@@ -57,7 +57,6 @@ in {
 
   "briefkasten/restic/gotosocial.age".publicKeys                    = [ leah briefkasten ];
   "briefkasten/restic/influxdb.age".publicKeys                      = [ leah briefkasten ];
-  "briefkasten/restic/ctucx-things.age".publicKeys                  = [ leah briefkasten ];
 
   "briefkasten/restic/syncthing-audiobooks-orig.age".publicKeys     = [ leah briefkasten ];
   "briefkasten/restic/syncthing-audiobooks.age".publicKeys          = [ leah briefkasten ];

@@ -84,6 +83,7 @@ in {
   "trabbi/restic/matrix-synapse.age".publicKeys                     = [ leah trabbi ];
   "trabbi/restic/mail.age".publicKeys                               = [ leah trabbi ];
   "trabbi/restic/gotosocial.age".publicKeys                         = [ leah trabbi ];
+  "trabbi/restic/ctucx-things.age".publicKeys                       = [ leah trabbi ];
 
   "trabbi/mail/password-leah-ctu.cx.age".publicKeys                 = [ leah trabbi ];
   "trabbi/mail/password-vaultwarden-ctu.cx.age".publicKeys          = [ leah trabbi ];

diff --git a/secrets/trabbi/restic/ctucx-things.age b/secrets/trabbi/restic/ctucx-things.age
@@ -0,0 +1,12 @@
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzM1dBR3lQVXdFMXdBOFdn
+UUU4cjhDYnNZYVBjUzVtUUNWTmE1OVQ5dGxFCmlleit4cHcxeHhQQThPM1Avd2Ja
+a0t1U0JSTzRjODhGUk1SUW9qRTBFaVUKLT4gc3NoLWVkMjU1MTkgVjB1VXJ3IEhS
+RnRGbjRMaVJwcnpVTS8vUjBjRVdxSndhd1ltTGh3cU1hZ1NoTC94MEkKZnE3ZVA2
+MkNJbEpRQ09SRGlKa3lhUDBGcXZ6TURjTkVLTWNLTHE0OEtGcwotPiAkei5AbjAt
+Z3JlYXNlIHRoIFIgXDQ9c21oIE1pPCpzCjhKMWZReUE1V2Z2T3Bqd0VUT0prbzJL
+UndEZ0V4VjZCcjFZCi0tLSBxNldTdXAvcWNjRnZaV3NSd0hMVmZ4dndpQjdFWExW
+MVJjZTlIMFhVbU53Csqcr64Nr/PEjQq3a+NgnbmXt6w5gqhq8OvdCmXkqdgMqOj1
+qe1Z6PnZ/H30T65LtTfST2fVJkypliokh/JmizR1Zb+phDe+Em35igya5qlm30LZ
+yYgXbR6Uat7EWSsavg==
+-----END AGE ENCRYPTED FILE-----