From 65c5ce955f5e48b4d842d752a32134564bad70b6 Mon Sep 17 00:00:00 2001 From: Administrator Date: Tue, 18 Nov 2025 13:13:44 +0100 Subject: [PATCH] fix: add common hosts to toplevel hosts.nix --- ekman/hosts.nix | 3 --- gw/default.nix | 2 +- hosts.nix | 4 ++++ rossby/default.nix | 2 +- rossby/hosts.nix | 3 --- 5 files changed, 6 insertions(+), 8 deletions(-) create mode 100644 hosts.nix diff --git a/ekman/hosts.nix b/ekman/hosts.nix index df15a7d..5b2ed0d 100644 --- a/ekman/hosts.nix +++ b/ekman/hosts.nix @@ -1,7 +1,4 @@ '' - 10.255.241.210 slurmdbd - 10.255.241.210 slurm-accounting - 10.255.241.99 ekman-manage 10.255.241.100 ekman 10.255.241.101 c0-1 diff --git a/gw/default.nix b/gw/default.nix index b9e8af5..7c633a5 100644 --- a/gw/default.nix +++ b/gw/default.nix @@ -11,7 +11,7 @@ "oceanbox.io" ]; useDHCP = false; - extraHosts = import ../hosts.nix; + extraHosts = import ../hosts.nix + import ./hosts.nix; }; services.resolved = { diff --git a/hosts.nix b/hosts.nix new file mode 100644 index 0000000..be4d296 --- /dev/null +++ b/hosts.nix @@ -0,0 +1,4 @@ +'' + 10.255.241.210 slurmdbd + 10.255.241.210 slurm-accounting +'' diff --git a/rossby/default.nix b/rossby/default.nix index e3df0fd..4309f02 100644 --- a/rossby/default.nix +++ b/rossby/default.nix @@ -110,7 +110,7 @@ let "172.16.239.221" ]; search = [ "rossby.vtn.obx" ]; - extraHosts = import ./hosts.nix; + extraHosts = import ../hosts.nix + import ./hosts.nix; firewall.extraCommands = '' iptables -I INPUT -s 172.16.239.0/24 -j ACCEPT iptables -I INPUT -s 10.16.239.0/24 -j ACCEPT diff --git a/rossby/hosts.nix b/rossby/hosts.nix index 6a505b4..16dc36c 100644 --- a/rossby/hosts.nix +++ b/rossby/hosts.nix @@ -1,7 +1,4 @@ '' - 10.255.241.210 slurmdbd - 10.255.241.210 slurm-accounting - 172.16.239.221 rossby-manage 172.16.239.222 rossby 172.16.239.111 c0-1