diff --git a/hosts/hydra/nomad-server.nix b/hosts/hydra/nomad-server.nix index e5a7affa..6553e4e0 100644 --- a/hosts/hydra/nomad-server.nix +++ b/hosts/hydra/nomad-server.nix @@ -3,7 +3,7 @@ { zentralwerk, config, pkgs, ... }: let inherit (config.networking) hostName; - ipv6Addr = zentralwerk.lib.config.site.net.serv.hosts6.dn42.${hostName}; + ipv4Addr = zentralwerk.lib.config.site.net.serv.hosts4.${hostName}; in { services.nomad = { @@ -13,12 +13,6 @@ in settings = { datacenter = "c3d2"; plugin.raw_exec.config.enabled = true; - - addresses = { - http = "::1"; - rpc = ipv6Addr; - serf = ipv6Addr; - }; server = { enabled = true; bootstrap_expect = 3; diff --git a/modules/cluster/default.nix b/modules/cluster/default.nix index c076f6e4..d18040fa 100644 --- a/modules/cluster/default.nix +++ b/modules/cluster/default.nix @@ -14,7 +14,7 @@ let else result ) null [ "cluster" "serv" ]; - ipv6Addr = zentralwerk.lib.config.site.net.${serverNet hostName}.hosts6.dn42.${hostName}; + ipv4Addr = zentralwerk.lib.config.site.net.${serverNet hostName}.hosts4.${hostName}; in { imports = [ ]; @@ -59,19 +59,13 @@ in { datacenter = "c3d2"; plugin.raw_exec.config.enabled = true; - addresses = { - http = "::1"; - rpc = ipv6Addr; - serf = ipv6Addr; - }; - server = { enabled = true; bootstrap_expect = 3; }; server_join = { retry_join = map (server: - zentralwerk.lib.config.site.net.${serverNet server}.hosts6.dn42.${server} + zentralwerk.lib.config.site.net.${serverNet server}.hosts4.${server} ) ( builtins.filter (server: server != hostName) servers @@ -81,7 +75,6 @@ in { client = { enabled = true; network_interface = "cluster"; - servers = [ "localhost" ]; }; }; };