fixup! refactor(specialArgs,nixosConfigurations/*): use config.passthru

holochain · Oct 4, 2024 · 37e217c · 37e217c
1 parent 247433d
commit 37e217c
Showing 1 changed file with 28 additions and 21 deletions.
diff --git a/modules/flake-parts/nixosConfigurations.turn-3/configuration.nix b/modules/flake-parts/nixosConfigurations.turn-3/configuration.nix
@@ -5,18 +5,7 @@
   pkgs,
   ...
 }:
-let
-  hostName = "turn-3";
 
-  turnIpv4 = "65.21.54.162";
-  turnFqdn = "${hostName}.infra.holochain.org";
-
-  signalIpv4 = "95.217.241.142";
-  signalFqdn = "signal-3.infra.holochain.org";
-
-  bootstrapIpv4 = "65.109.242.243";
-  bootstrapFqdn = "bootstrap-3.infra.holochain.org";
-in
 {
   imports = [
     inputs.disko.nixosModules.disko
@@ -38,9 +27,27 @@ in
     self.nixosModules.kitsune-bootstrap
   ];
 
-  networking.hostName = hostName; # Define your hostname.
+  passthru = {
+    fqdn = "${config.passthru.hostName}.${config.passthru.domain}";
+
+    domain = self.specialArgs.infraDomain;
+    hostName = "turn-3";
+
+    primaryIpv4 = "65.21.54.162";
 
-  hostName = turnIpv4;
+    turnIpv4 = config.passthru.primaryIpv4;
+    signalIpv4 = "95.217.241.142";
+    bootstrapIpv4 = "65.109.242.243";
+
+    turnFqdn = "${config.passthru.hostName}.${config.passthru.domain}";
+    signalFqdn = "signal-3.${config.passthru.domain}";
+    bootstrapFqdn = "bootstrap-3.${config.passthru.domain}";
+  };
+
+  hostName = config.passthru.primaryIpv4;
+  networking = {
+    inherit (config.passthru) hostName domain;
+  };
 
   nix.settings.max-jobs = 8;
 
@@ -53,16 +60,16 @@ in
   # FIXME: is there a better way to do this?
   environment.etc."systemd/network/10-cloud-init-eth0.network.d/00-floating-ips.conf".text = ''
     [Network]
-    Address = ${signalIpv4}/32
-    Address = ${bootstrapIpv4}/32
+    Address = ${config.passthru.signalIpv4}/32
+    Address = ${config.passthru.bootstrapIpv4}/32
   '';
 
   system.stateVersion = "23.11";
 
   services.holochain-turn-server = {
     enable = true;
-    url = turnFqdn;
-    address = turnIpv4;
+    url = config.passthru.turnFqdn;
+    address = config.passthru.turnIpv4;
     username = "test";
     credential = "test";
     verbose = false;
@@ -74,10 +81,10 @@ in
 
   services.tx5-signal-server = {
     enable = true;
-    address = signalIpv4;
+    address = config.passthru.signalIpv4;
     port = 8443;
     tls-port = 443;
-    url = signalFqdn;
+    url = config.passthru.signalFqdn;
     iceServers = [
       { urls = [ "stun:${config.services.holochain-turn-server.url}:80" ]; }
       {
@@ -94,9 +101,9 @@ in
 
   services.kitsune-bootstrap = {
     enable = true;
-    address = bootstrapIpv4;
+    address = config.passthru.bootstrapIpv4;
     port = 8444;
     tls-port = 443;
-    url = bootstrapFqdn;
+    url = config.passthru.bootstrapFqdn;
   };
 }