From 508942d0f0e147beec5855a71632fbda0ab7278b Mon Sep 17 00:00:00 2001
From: Sam <samual.shop@proton.me>
Date: Tue, 25 Feb 2025 13:39:52 +0000
Subject: [PATCH] change git.bitlab21.com knownhost key for bd-worker container

---
 .../distributed-builds/remote-builder-machine.nix    |  2 +-
 .../optional/nixos-containers/baseddata-worker.nix   | 12 ++++++------
 .../keys}/remotebuild.pub                            |  0
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename hosts/common/{optional/distributed-builds => users/keys}/remotebuild.pub (100%)

diff --git a/hosts/common/optional/distributed-builds/remote-builder-machine.nix b/hosts/common/optional/distributed-builds/remote-builder-machine.nix
index 74a33cf..b13fe2f 100644
--- a/hosts/common/optional/distributed-builds/remote-builder-machine.nix
+++ b/hosts/common/optional/distributed-builds/remote-builder-machine.nix
@@ -5,7 +5,7 @@
     group = "remotebuild";
 
     openssh.authorizedKeys.keyFiles = [
-      ./remotebuild.pub
+      ../../users/keys/remotebuild.pub
     ];
   };
 
diff --git a/hosts/common/optional/nixos-containers/baseddata-worker.nix b/hosts/common/optional/nixos-containers/baseddata-worker.nix
index 2cd11ed..6f6c58c 100644
--- a/hosts/common/optional/nixos-containers/baseddata-worker.nix
+++ b/hosts/common/optional/nixos-containers/baseddata-worker.nix
@@ -148,11 +148,11 @@ in {
         mode = "0600";
         path = "/root/.pgsync.yml";
         content = ''
-            from: postgresql://${config.sops.placeholder."software/postgres/baseddata/user_username"}:${config.sops.placeholder."software/postgres/baseddata/user_password"}@${postgresIp}/baseddata
-            to: postgresql://${config.sops.placeholder."software/postgres/baseddata/user_username"}:${config.sops.placeholder."software/postgres/baseddata/user_password"}@${postgresRemoteIp}/baseddata
-            schemas:
-              - models_final
-            to_safe: true
+          from: postgresql://${config.sops.placeholder."software/postgres/baseddata/user_username"}:${config.sops.placeholder."software/postgres/baseddata/user_password"}@${postgresIp}/baseddata
+          to: postgresql://${config.sops.placeholder."software/postgres/baseddata/user_username"}:${config.sops.placeholder."software/postgres/baseddata/user_password"}@${postgresRemoteIp}/baseddata
+          schemas:
+            - models_final
+          to_safe: true
 
         '';
       };
@@ -291,7 +291,7 @@ in {
 
       programs.ssh.knownHosts = {
         "git.bitlab21.com" = {
-          publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIALNd2BGf64heYjWT9yt0fVmngepiHRIMsL7au/MRteg";
+          publicKey = "git.bitlab21.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFSGyrQvwa7gj0tG/EX3siWzGT9badUkD0yw0YGkcNeQ";
         };
       };
 
diff --git a/hosts/common/optional/distributed-builds/remotebuild.pub b/hosts/common/users/keys/remotebuild.pub
similarity index 100%
rename from hosts/common/optional/distributed-builds/remotebuild.pub
rename to hosts/common/users/keys/remotebuild.pub