diff --git a/nixos/modules/services/monitoring/cockpit.nix b/nixos/modules/services/monitoring/cockpit.nix index 31620b31eb31..0ea4a5c163f8 100644 --- a/nixos/modules/services/monitoring/cockpit.nix +++ b/nixos/modules/services/monitoring/cockpit.nix @@ -55,6 +55,7 @@ in { systemd.packages = [ cfg.package ]; systemd.sockets.cockpit.wantedBy = [ "multi-user.target" ]; + systemd.sockets.cockpit.listenStreams = [ "" (toString cfg.port) ]; systemd.tmpfiles.rules = [ # From $out/lib/tmpfiles.d/cockpit-tmpfiles.conf "C /run/cockpit/inactive.motd 0640 root root - ${cfg.package}/share/cockpit/motd/inactive.motd" diff --git a/nixos/tests/cockpit.nix b/nixos/tests/cockpit.nix index 5236f5311f02..0433cebf3b56 100644 --- a/nixos/tests/cockpit.nix +++ b/nixos/tests/cockpit.nix @@ -21,10 +21,11 @@ import ./make-test-python.nix ( }; services.cockpit = { enable = true; + port = 7890; openFirewall = true; settings = { WebService = { - Origins = "https://server:9090"; + Origins = "https://server:7890"; }; }; }; @@ -65,7 +66,7 @@ import ./make-test-python.nix ( driver.implicitly_wait(10) log("Opening homepage") - driver.get("https://server:9090") + driver.get("https://server:7890") def wait_elem(by, query, timeout=10): @@ -107,7 +108,7 @@ import ./make-test-python.nix ( driver.find_element(By.CSS_SELECTOR, 'button#login-button').click() # driver.implicitly_wait(1) - # driver.get("https://server:9090/system") + # driver.get("https://server:7890/system") log("Waiting dashboard to load") wait_title_contains("${user}@server") @@ -143,9 +144,9 @@ import ./make-test-python.nix ( start_all() server.wait_for_unit("sockets.target") - server.wait_for_open_port(9090) + server.wait_for_open_port(7890) - client.succeed("curl -k https://server:9090 -o /dev/stderr") + client.succeed("curl -k https://server:7890 -o /dev/stderr") print(client.succeed("whoami")) client.succeed('PYTHONUNBUFFERED=1 selenium-script') '';