From 38ee1afb53a081548f0cdd3c0e5c2bf5a1e9e071 Mon Sep 17 00:00:00 2001
From: Sridhar Ratnakumar <srid@srid.ca>
Date: Sat, 24 Dec 2022 12:39:30 -0500
Subject: [PATCH] conslidate system metadata in one place

---
 secrets/secrets.nix           | 2 +-
 systems/darwin.nix            | 2 +-
 systems/hetzner/ax41.info.nix | 4 ++++
 systems/hetzner/ax41.nix      | 2 +-
 systems/hetzner/ax41.pub      | 1 -
 5 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 systems/hetzner/ax41.info.nix
 delete mode 100644 systems/hetzner/ax41.pub

diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index 54e111b..3385eb7 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -1,7 +1,7 @@
 let
   keys = [
     (builtins.readFile ../nixos/takemessh/id_rsa.pub)
-    (builtins.readFile ../systems/hetzner/ax41.pub)
+    (import ../systems/hetzner/ax41.info.nix).hostKeyPub
   ];
 in
 {
diff --git a/systems/darwin.nix b/systems/darwin.nix
index 8eded3d..ac9755f 100644
--- a/systems/darwin.nix
+++ b/systems/darwin.nix
@@ -51,7 +51,7 @@
     distributedBuilds = true;
     buildMachines = [
       {
-        hostName = "88.198.33.237"; # pinch
+        hostName = (import ../hetzner/ax41.info.nix).publicIP;
         system = "x86_64-linux";
         maxJobs = 10;
       }
diff --git a/systems/hetzner/ax41.info.nix b/systems/hetzner/ax41.info.nix
new file mode 100644
index 0000000..c2b81ea
--- /dev/null
+++ b/systems/hetzner/ax41.info.nix
@@ -0,0 +1,4 @@
+{
+  hostKeyPub = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMI2BuoFaJD7dfOuJUP0yGWsQ4+tnKojUZiAQgIb44uj root@pinch";
+  publicIP = "88.198.33.237";
+}
diff --git a/systems/hetzner/ax41.nix b/systems/hetzner/ax41.nix
index 81c8ace..864e9a1 100644
--- a/systems/hetzner/ax41.nix
+++ b/systems/hetzner/ax41.nix
@@ -58,7 +58,7 @@
     ipv4 = {
       addresses = [{
         # Server main IPv4 address
-        address = "88.198.33.237";
+        address = (import ./ax41.info.nix).publicIP;
         prefixLength = 24;
       }];
 
diff --git a/systems/hetzner/ax41.pub b/systems/hetzner/ax41.pub
deleted file mode 100644
index a5bdbb2..0000000
--- a/systems/hetzner/ax41.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMI2BuoFaJD7dfOuJUP0yGWsQ4+tnKojUZiAQgIb44uj root@pinch
\ No newline at end of file