From 3e942f9b7330c8cc5ebd74f2108e8d4cceb72123 Mon Sep 17 00:00:00 2001
From: Brendan Golden <git@brendan.ie>
Date: Wed, 18 Jan 2023 02:37:16 +0000
Subject: [PATCH] fmt: organised varibles for deployment

---
 machines/agentjones.nix | 8 ++++++--
 machines/vendetta.nix   | 7 +++++--
 machines/vigil.nix      | 9 +++++----
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/machines/agentjones.nix b/machines/agentjones.nix
index 4e96ef2..be16684 100644
--- a/machines/agentjones.nix
+++ b/machines/agentjones.nix
@@ -11,9 +11,13 @@
 
 { pkgs, lib, nodes, ... }:
 let
+  # name of the server, sets teh hostname and record for it
+  name = "agentjones";
+
   ip_pub    = "193.1.99.72";
   ip_priv   = "172.20.20.1";
-  hostname  = "agentjones.skynet.ie";
+  # hostname  = "${name}.skynet.ie";
+  hostname  = ip_pub;
 
 in {
   imports = [
@@ -30,7 +34,7 @@ in {
 
   skynet_dns.records = {
     external = [
-      "agentjones       A       ${ip_pub}"
+      "${name}       A       ${ip_pub}"
     ];
     cname = [];
   };
diff --git a/machines/vendetta.nix b/machines/vendetta.nix
index 946e4b3..a5c0472 100644
--- a/machines/vendetta.nix
+++ b/machines/vendetta.nix
@@ -12,9 +12,12 @@
 
 { pkgs, lib, nodes, ... }:
 let
+   # name of the server, sets teh hostname and record for it
+   name = "vendetta";
+
   ip_pub    = "193.1.99.120";
   ip_priv   = "172.20.20.3";
-  # hostname  = "vendetta.skynet.ie";
+  # hostname  = "${name}.skynet.ie";
   hostname  = ip_pub;
 
   # sets which nameserver it is
@@ -45,7 +48,7 @@ in {
      own = {
        nameserver = ns;
        external = [
-         "vendetta         A       ${ip_pub}"
+         "${name}         A       ${ip_pub}"
          "${ns}              A       ${ip_pub}"
 
          # needs this, temporally
diff --git a/machines/vigil.nix b/machines/vigil.nix
index 8ba829c..0145ea6 100644
--- a/machines/vigil.nix
+++ b/machines/vigil.nix
@@ -12,10 +12,11 @@
 
 { pkgs, lib, nodes, ... }:
 let
-  # ip_pub    = "193.1.99.121";
-  ip_pub    = "192.168.1.157";
+  name = "vigil";
+
+  ip_pub    = "193.1.99.121";
   ip_priv   = "172.20.20.4";
-  # hostname  = "vigil.skynet.ie";
+  # hostname  = "${name}.skynet.ie";
   hostname  = ip_pub;
 
   # sets which nameserver it is
@@ -46,7 +47,7 @@ in {
     own = {
       nameserver = ns;
       external = [
-        "vigil            A       ${ip_pub}"
+        "${name}            A       ${ip_pub}"
         "${ns}              A       ${ip_pub}"
       ];
       cname = [