fixup! cluster/services/consul: test in simulacrum

cluster/services/consul/test.nix

@@ -5,9 +5,10 @@
     start_all()
 
     with subtest("should form cluster"):
-      for machine in machines:
+      nodes = [ n for n in machines if n != nowhere ]
+      for machine in nodes:
         machine.succeed("systemctl start consul-ready.service")
-      for machine in machines:
+      for machine in nodes:
         consulConfig = json.loads(machine.succeed("cat /etc/consul.json"))
         addr = consulConfig["addresses"]["http"]
         port = consulConfig["ports"]["http"]

cluster/simulacrum/default.nix

@@ -59,13 +59,11 @@ testers.runNixOSTest {
   imports = [
     serviceConfig.simulacrum.settings
     ./nowhere
-    ({ config, ... }: {
+    {
-      config = lib.mkIf config.nowhere.enable {
+      nodes.nowhere.imports = [
-        nodes.nowhere.imports = [
+        config.flake.nixosModules.port-magic
-          lift.flake.nixosModules.port-magic
+      ];
-        ];
+    }
-      };
-    })
   ] ++ allAugments;
 
   _module.args = {

cluster/simulacrum/nowhere/default.nix

@@ -58,46 +58,44 @@ in
   imports = [
     ./options.nix
   ];
-  config = lib.mkIf config.nowhere.enable {
+  defaults = {
-    defaults = {
+    networking.hosts."${getNodeAddr "nowhere"}" = lib.attrNames config.nowhere.names;
-      networking.hosts."${getNodeAddr "nowhere"}" = lib.attrNames config.nowhere.names;
+    security.pki.certificateFiles = [
-      security.pki.certificateFiles = [
+      "${ca}/ca.pem"
-        "${ca}/ca.pem"
+    ];
-      ];
+  };
-    };
 
-    nowhere.certs = {
+  nowhere.certs = {
-      inherit ca;
+    inherit ca;
-      intermediate = genCert [ "--config=${cfsslConfigIntermediateCA}" "--profile=intermediate" ] {
+    intermediate = genCert [ "--config=${cfsslConfigIntermediateCA}" "--profile=intermediate" ] {
-        CN = "Simulacrum Intermediate CA";
+      CN = "Simulacrum Intermediate CA";
-      };
     };
+  };
 
-    nodes.nowhere = { config, depot, ... }: {
+  nodes.nowhere = { config, depot, ... }: {
-      networking = {
+    networking = {
-        firewall.allowedTCPPorts = [ 443 ];
+      firewall.allowedTCPPorts = [ 443 ];
-        interfaces.eth1.ipv4.routes = lib.mapAttrsToList (name: hour: {
+      interfaces.eth1.ipv4.routes = lib.mapAttrsToList (name: hour: {
-          address = hour.interfaces.primary.addrPublic;
+        address = hour.interfaces.primary.addrPublic;
-          prefixLength = 32;
+        prefixLength = 32;
-          via = getNodeAddr name;
+        via = getNodeAddr name;
-        }) depot.gods.fromLight;
+      }) depot.gods.fromLight;
-        nameservers = map (name: depot.hours.${name}.interfaces.primary.addrPublic) cluster.config.services.dns.nodes.authoritative;
+      nameservers = map (name: depot.hours.${name}.interfaces.primary.addrPublic) cluster.config.services.dns.nodes.authoritative;
-      };
+    };
-      services.nginx = {
+    services.nginx = {
-        enable = true;
+      enable = true;
-        recommendedProxySettings = true;
+      recommendedProxySettings = true;
-        virtualHosts = lib.mapAttrs (name: link: let
+      virtualHosts = lib.mapAttrs (name: link: let
-          cert = genHostCert name;
+        cert = genHostCert name;
-        in {
+      in {
-          forceSSL = true;
+        forceSSL = true;
-          sslCertificate = "${cert}/cert.pem";
+        sslCertificate = "${cert}/cert.pem";
-          sslCertificateKey = "${cert}/cert-key.pem";
+        sslCertificateKey = "${cert}/cert-key.pem";
-          locations."/" = {
+        locations."/" = {
-            proxyPass = config.links.${link}.url;
+          proxyPass = config.links.${link}.url;
-            extraConfig = "proxy_ssl_verify off;";
+          extraConfig = "proxy_ssl_verify off;";
-          };
+        };
-        }) lift.nowhere.names;
+      }) lift.nowhere.names;
-      };
     };
   };
 }

cluster/simulacrum/nowhere/options.nix

@@ -2,7 +2,6 @@
 
 {
   options.nowhere = {
-    enable = lib.mkEnableOption "Nowhere";
     names = lib.mkOption {
       description = "Hostnames that point Nowhere.";
       type = with lib.types; attrsOf str;