ctucx.git: nixfiles

machines/trabbi: move `radicale` to `hector`

diff --git a/machines/hector/default.nix b/machines/hector/default.nix
@@ -12,6 +12,9 @@
     ./prometheus.nix
     ./grafana
 
+    # cal- and card-dav server
+    ./radicale.nix
+
     ./syncthing.nix
   ];
 

diff --git a/machines/trabbi/radicale.nix b/machines/hector/radicale.nix

diff --git a/machines/trabbi/default.nix b/machines/trabbi/default.nix
@@ -8,9 +8,6 @@
   imports = [
     ./hardware-configuration.nix
 
-    # cal- and card-dav server
-    ./radicale.nix
-
     # git server (gitolite+stagit)
     ./git.nix
 

diff --git a/secrets/hector/radicale-users.age b/secrets/hector/radicale-users.age
@@ -0,0 +1,12 @@
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjUEcrWWVmZDdXVVFUSDNx
+WTJ5eWY0VHlxbXF3b3dqQ3FrYW5SWWUwRjBVCkVac2JtNDN0aGFYaDdaNmtpeHZL
+dXp3Tkwwc0MwN2dSNXF3NGVHV0pVQ2MKLT4gc3NoLWVkMjU1MTkgeWFMSFNRIERP
+bGhVVEhvdlZzZERJNVV5ZGpLbUdITndhd1lpRDh5VUtkZnF6ZG9sQ3MKL0VjVlRt
+YzJZUjQzcG9wZ05tY3NVTjJsYzlDTUk0c0Z5bzczM3VGd1l4MAotPiBLLWdyZWFz
+ZSBbUkxKIGppJkBmIGkgKlkKRlRQUkVUVzd2ZlNmb2RNV01XVUJ5K0Z0R1lqZDRy
+MnZqWVE4NkEzUkEvZURhakdwZFZLRWFlOFc5OWt5WGVQUwoKLS0tIG5PVHlWaVpV
+Sy95NFhna1NtZmh1YlVaa1I3emFSSnVOWjhabUZ1QWlRekEKhfOQdanKb57QWIP4
+FEztX/WSDsIOHSljR8I4nr7lzGa4pE+s5Wj6UYubqxkcOR8fgukojaYwCqpAAEXt
+sPNw9y/86JfJSM/3PDsiHVS6T6PIIjGxnla2GzQ=
+-----END AGE ENCRYPTED FILE-----

diff --git a/secrets/hector/restic/radicale.age b/secrets/hector/restic/radicale.age
@@ -0,0 +1,11 @@
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnVi9PVzZMZkxEQ0dRNnk2
+bG5BVmtuRGxxWDBtaStJSEJiV2orR1UyK1IwCk05T3JsSUkySk5KTU53R25RUUcv
+Y1hIYjQ3dDBkMFFUcisvcndleGEvY3cKLT4gc3NoLWVkMjU1MTkgeWFMSFNRIC9t
+YVo0Q2IrWjBsbm91cVdLNWFhbG1hVld6T25xNStNQjVkTkFLOXhqVzQKYWFJY0t1
+dzArdDViUFhpRERuM2dBVWJZc2JMUXJ2S0l0akJPWndBMEw3UQotPiA3b2hfWFFu
+LWdyZWFzZQpIQmVJMlRtVWhvVlVveFBGWnNiNVFOQmF0UDN2VGJXK1FlWkhHUDho
+VHJuRVpUTzhKZwotLS0gc3lWNjEraTk3SmVLamZYTWQ0dUQxR0JWbVB1cldYOUhv
+NFd2R2h0Mzljawq68Pxp5FLvJo7Xyt2jjLGuZHtTIzMf+YAMt/GhXfEw8B5JZgCh
+JUen5B+QyAYGY5O9UB+ygqaX65FL
+-----END AGE ENCRYPTED FILE-----

diff --git a/secrets/secrets.nix b/secrets/secrets.nix
@@ -69,13 +69,11 @@ in {
 
   "trabbi/restic/mail.age".publicKeys                               = [ main-key trabbi ];
   "trabbi/restic/matrix-synapse.age".publicKeys                     = [ main-key trabbi ];
-  "trabbi/restic/radicale.age".publicKeys                           = [ main-key trabbi ];
   "trabbi/restic/ctucx-things.age".publicKeys                       = [ main-key trabbi ];
   "trabbi/restic/gitolite.age".publicKeys                           = [ main-key trabbi ];
   "trabbi/restic/vaultwarden.age".publicKeys                        = [ main-key trabbi ];
   "trabbi/restic/gotosocial.age".publicKeys                         = [ main-key trabbi ];
 
-  "trabbi/radicale-users.age".publicKeys                            = [ main-key trabbi ];
   "trabbi/travelynx2fedi-env.age".publicKeys                        = [ main-key trabbi ];
   "trabbi/vaultwarden-secrets.age".publicKeys                       = [ main-key trabbi ];
   "trabbi/gotosocial-env.age".publicKeys                            = [ main-key trabbi ];

@@ -94,9 +92,13 @@ in {
   "wanderduene/syncthing/cert.age".publicKeys                       = [ main-key wanderduene ];
 
 
+  "hector/restic/radicale.age".publicKeys                           = [ main-key hector ];
+
   "hector/syncthing/key.age".publicKeys                             = [ main-key hector ];
   "hector/syncthing/cert.age".publicKeys                            = [ main-key hector ];
 
+  "hector/radicale-users.age".publicKeys                            = [ main-key hector ];
+
 
   "wanderduene/wireguard-privkey.age".publicKeys                    = [ main-key wanderduene ];
   "wanderduene/restic-server-htpasswd.age".publicKeys               = [ main-key wanderduene ];

diff --git a/secrets/trabbi/radicale-users.age b/secrets/trabbi/radicale-users.age
@@ -1,13 +0,0 @@
------BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrbnJYNnB5TExSM2c0a3dF
-dEpoOGliVUU1TXN0TVhjOExYWTE2VTFJRG00CkdhbHhxZVNIaGYrR0JyaGNWMERN
-NzIrY25LaUhNbkVYWkkxbSt2OGlTU0EKLT4gc3NoLWVkMjU1MTkgcThvY3pnIGVh
-dW1RV0QwZ21Ja2l5MGdrY280NVMrUmN5Rk84Zy9vc1U5K2ZMZXhKRlUKY2dxTDdY
-RSs5dEFVbHZNTFZkVU9tOGt6Rkg2bDNpTTQ0K0gvN2JWNWtpcwotPiBHKk87SjMt
-Z3JlYXNlCnFjTThkenV3eHpJc01YcG1DU2NxWTJDNGVrbW0xa1h2NTJSV2VKSHd5
-OGdIWjlQOHM0NGRjTUROOHJmRzJUSFkKUUdOblp5dEZ1U3kxWnNSUll4SHU1MlNj
-bVNYckc4MHNBSkNQeFdtSnVKOThNZTBGUEI3U1BSRldVNlo2cmhmQwpLanMxCi0t
-LSBYd2x1Z256S1JyOUhPMmwxaTg4S0labW1qUFhXbmpvdktqUDZ4SGN2clIwCnV/
-q8ZyGdM9wKd1o0bz2Fu08828lcw/qJU6iLaNdXBBXFCHz5XPLhlO/hFB7FKltEMK
-16Y7CkvEj3ZeqK4Fm9kbfxyPoySt6GSmFGtHtGhrkoypBKAu2HEm
------END AGE ENCRYPTED FILE-----

diff --git a/secrets/trabbi/restic/radicale.age b/secrets/trabbi/restic/radicale.age
@@ -1,13 +0,0 @@
------BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFTU96QzdZMEhwV2x5aFZw
-UER4aGtVOHdycVlISFJmUnBhVU5NOGdxb3hrCjBVbWtoc1NUOHlEcW11Z1ZtZzd0
-UXpYeGhqV2ZHdjJOUEM1UG9DNFgxemsKLT4gc3NoLWVkMjU1MTkgcThvY3pnIFZK
-TDBySHNCYU5QUUdmR2tkSUJmVFpTcHBZNkVWemhwaGVLdit3aU56bE0KeWw2d0I2
-SWVzVGh4UDBRd29qWVZtZFB0U3c1d3lXRTMzYXZianRVbjRsMAotPiBVVCJvflkt
-Z3JlYXNlIFggRTt0ZFp8biMgcm18JCVQClJOdkdUL2dQdjBSZDM1bFRaOEJDMDhy
-WjVTMXp2aTRqZnUzSCtpYlVETldJaEI1UEFZR1U5Rk1xS2E4SWtvaHcKNkRnSVV3
-YSsxZklTV0ZNWVhnekVLa0hzT3lMZ2RNR0dENE1RN1V0cE9qZ2ZuSkNieXcKLS0t
-IGdkVytrUUJ6RWxlTy95bUhhR1Y1VXdOUm9XOCtLRDUvVnJsM0R4SHdpQlEKjfOY
-7kK837nVP6/pzvAXpwSV8V0c8hKQw6FyAIu5C9g1et/Xz6frBP627HdBpJ4Ged2B
-099BbCUeJQ==
------END AGE ENCRYPTED FILE-----