ctucx.git: nixfiles

ctucx' nixfiles

commit b16a7025522ce5a1cd68a18e89d8be0d44dcd8aa
parent 00585290749d5333c5fce1ad7c385f8f7f16685f
Author: Katja (ctucx) <git@ctu.cx>
Date: Tue, 3 Dec 2024 07:50:32 +0100

machines/trabbi: move git to `hector`
7 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/configurations/common/programs/ssh.nix b/configurations/common/programs/ssh.nix
@@ -22,7 +22,7 @@ in {
       matchBlocks = {
         "ctucx-git" = {
           user     = "git";
-          hostname = "trabbi.ctu.cx";
+          hostname = "hector.ctu.cx";
         };
       };
     };
diff --git a/machines/hector/default.nix b/machines/hector/default.nix
@@ -18,6 +18,9 @@
     # vaultwarden password-store
     ./vaultwarden.nix
 
+    # git server (gitolite+stagit)
+    ./git.nix
+
     ./syncthing.nix
 
     ./websites
diff --git a/machines/trabbi/git.nix b/machines/hector/git.nix
diff --git a/machines/trabbi/default.nix b/machines/trabbi/default.nix
@@ -8,9 +8,6 @@
   imports = [
     ./hardware-configuration.nix
 
-    # git server (gitolite+stagit)
-    ./git.nix
-
     # communication
     ./fedi
     ./matrix
diff --git a/secrets/hector/restic/gitolite.age b/secrets/hector/restic/gitolite.age
@@ -0,0 +1,11 @@
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5dmpqZnhiWFhicXNRdTFF
+d3JlT3ZURTg3Q2Z3emJKTUhrbDRQeFRyVDNZClZsYzlrbTMwSUx4RzlDd0NaTjd5
+ZGZNNGJNRWh0UnJ1SWVBcCtURkVtSVEKLT4gc3NoLWVkMjU1MTkgeWFMSFNRIHZw
+algvQWtFRUhIN3NVaWdnMk96WGFZRzh1ZkZWbnV0M1NFeEk0cm5hVlkKR1UvaHNM
+amR5d2NPUVhySGFnWnJhWGp0ZzlmRHZSM1pyQ09yeDkzY0pUTQotPiBoci1ncmVh
+c2UKanRYOTBwa2RyY05kZXZxT2JGUy9XSXRxUVk2VXdTYmhDK0Fnd0hPWWx2eVVL
+dGlTc0trWGNOMkVyTmoveEMxZQpVQQotLS0gOXVsTzFqalNRSWxKMG9saTQxWE4w
+OGNRWXpGQ1ZCcDlBSVpFMmZPcHQzawrpcIEVrVBJkbI84cTxYYEjmfY6AEqNLS+m
+nvCdD1UQ9q6EjsqeaqmxntD5IDHOxgHqDjQR5UeiEvHH
+-----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/gitolite.age".publicKeys                           = [ main-key trabbi ];
   "trabbi/restic/gotosocial.age".publicKeys                         = [ main-key trabbi ];
 
   "trabbi/travelynx2fedi-env.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/restic/gitolite.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/gitolite.age b/secrets/trabbi/restic/gitolite.age
@@ -1,13 +0,0 @@
------BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzZG00YUpmR081NUUzMGE0
-Z25PRnZEQjc5TmJwVk8vanhobDdtZmxjRmlRCnpIdFFEMDJ0TVUveHIzek5nTU8w
-T2hpRUw0bVRSYU1ja0UyN2RBd3J6N2sKLT4gc3NoLWVkMjU1MTkgcThvY3pnIHdL
-Z1hOWk43VHhwZC9GL0Z3bmF0UlR1QndiRFZJa2ZvTnl0dFdGUVBzaVEKVDVIbG53
-dHAyYUIvYnRQaFM5MnV1VmxRM01rQUZxQm5YOWI2NG52WUVsVQotPiBtclgtZ3Jl
-YXNlIFIgWW4yUSBMMVZPe2M5NwpCRFJTYTZvQUFJUFJJOHhEL2t1UDlONHYwNWNu
-L1dXUzNrNUw4V3VzYUNqY1lWTTd3YVBTckpDNC9ialIrY3dZCkhwL2FJYzdrL3FP
-OW5nclpIVCs1cHJIOVBEQlBIc1RJNUR5VlBJYzB6ZDhCTDFvb1Jqc0JJZEovCi0t
-LSBzYWxXUEdpQVlEWit2Q1BhVXVRT3Q4VGJ0Sk1wTCswMkc2d2NKNzJtaDU0CoqD
-TxiIH0ODaByNQ1z+ouOmAiYNPG1l2+j6h/zSnC0wD2zhryRmIATc6joBWinLmZ+2
-A9BPmAYtg7M=
------END AGE ENCRYPTED FILE-----