movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00
Code Activity

[Backport release-24.11] cockpit: fix listen port (#371245) (#374897)

Browse source
This commit is contained in:
Gaétan Lepage 2025-01-29 11:18:09 +01:00 • committed by GitHub
commit d924e3463d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
nixos/modules/services/monitoring/cockpit.nix
View file

@ -55,6 +55,7 @@ in {
systemd.packages = [ cfg.package ]; systemd.packages = [ cfg.package ];
systemd.sockets.cockpit.wantedBy = [ "multi-user.target" ]; 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 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" "C /run/cockpit/inactive.motd 0640 root root - ${cfg.package}/share/cockpit/motd/inactive.motd"

11
nixos/tests/cockpit.nix
View file

@ -21,10 +21,11 @@ import ./make-test-python.nix (
}; };
services.cockpit = { services.cockpit = {
enable = true; enable = true;
port = 7890;
openFirewall = true; openFirewall = true;
settings = { settings = {
WebService = { WebService = {
Origins = "https://server:9090"; Origins = "https://server:7890";
}; };
}; };
}; };
@ -65,7 +66,7 @@ import ./make-test-python.nix (
driver.implicitly_wait(10) driver.implicitly_wait(10)
log("Opening homepage") log("Opening homepage")
driver.get("https://server:9090") driver.get("https://server:7890")
def wait_elem(by, query, timeout=10): 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.find_element(By.CSS_SELECTOR, 'button#login-button').click()
# driver.implicitly_wait(1) # driver.implicitly_wait(1)
# driver.get("https://server:9090/system") # driver.get("https://server:7890/system")
log("Waiting dashboard to load") log("Waiting dashboard to load")
wait_title_contains("${user}@server") wait_title_contains("${user}@server")
@ -143,9 +144,9 @@ import ./make-test-python.nix (
start_all() start_all()
server.wait_for_unit("sockets.target") 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")) print(client.succeed("whoami"))
client.succeed('PYTHONUNBUFFERED=1 selenium-script') client.succeed('PYTHONUNBUFFERED=1 selenium-script')
''; '';