cluster/services/consul/agent.nix

@@ -25,7 +25,7 @@ in
       bind_addr = hl.ipv4;
       ports.serf_lan = hl.port;
       retry_join = map (hostName: hostLinks.${hostName}.consul.tuple) (cfg.otherNodes.agent hostName);
-      bootstrap_expect = 3;
+      bootstrap_expect = builtins.length cfg.nodes.agent;
       addresses.http = config.links.consulAgent.ipv4;
       ports.http = config.links.consulAgent.port;
     };

cluster/services/dns/default.nix

@@ -60,7 +60,6 @@ in
       enable = true;
       deps = [ "consul" "acme-client" "patroni" ];
       settings = ./test.nix;
-      availableNodes = cfg.nodes.authoritative;
     };
   };
 

cluster/services/ways/default.nix

@@ -13,7 +13,6 @@
       enable = true;
       deps = [ "nginx" "acme-client" "dns" "certificates" "consul" ];
       settings = ./simulacrum/test.nix;
-      availableNodes = lib.take 3 config.services.ways.nodes.host;
     };
   };
 

cluster/services/ways/simulacrum/test.nix

@@ -20,7 +20,7 @@ in
         };
       };
     }
-    (lib.genAttrs cluster.config.services.ways.simulacrum.availableNodes (lib.const {
+    (lib.genAttrs cluster.config.services.ways.nodes.host (lib.const {
       services.nginx.upstreams.nowhere.servers = {
         "${(builtins.head config.nodes.nowhere.networking.interfaces.eth1.ipv4.addresses).address}:8080" = {};
       };