From 5b651da2433b45130eec8dd4df08a1f2983d3285 Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Thu, 25 Jan 2024 22:04:56 -0600 Subject: [PATCH 1/2] pomerium: add devusb to maintainers --- nixos/tests/pomerium.nix | 2 +- pkgs/servers/http/pomerium/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/pomerium.nix b/nixos/tests/pomerium.nix index abaf56c518e0..fcc83be16e15 100644 --- a/nixos/tests/pomerium.nix +++ b/nixos/tests/pomerium.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { name = "pomerium"; meta = with lib.maintainers; { - maintainers = [ lukegb ]; + maintainers = [ lukegb devusb ]; }; nodes = let base = myIP: { pkgs, lib, ... }: { diff --git a/pkgs/servers/http/pomerium/default.nix b/pkgs/servers/http/pomerium/default.nix index 7221011d2c38..d61134e2ccb7 100644 --- a/pkgs/servers/http/pomerium/default.nix +++ b/pkgs/servers/http/pomerium/default.nix @@ -122,7 +122,7 @@ buildGoModule rec { homepage = "https://pomerium.io"; description = "Authenticating reverse proxy"; license = licenses.asl20; - maintainers = with maintainers; [ lukegb ]; + maintainers = with maintainers; [ lukegb devusb ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; }; } From 04918db10a0691415f50fb939b230c577f1753bd Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Thu, 25 Jan 2024 22:04:59 -0600 Subject: [PATCH 2/2] nixos/pomerium: fix UI test --- nixos/tests/pomerium.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/pomerium.nix b/nixos/tests/pomerium.nix index fcc83be16e15..d0204488e8ef 100644 --- a/nixos/tests/pomerium.nix +++ b/nixos/tests/pomerium.nix @@ -103,7 +103,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { with subtest("ui"): pomerium.succeed( # check for a string that only appears if the UI is displayed correctly - "chromium --no-sandbox --headless --disable-gpu --dump-dom --host-resolver-rules='MAP login.required 127.0.0.1:80' http://login.required/.pomerium | grep 'contact your administrator'" + "chromium --no-sandbox --headless --disable-gpu --dump-dom --host-resolver-rules='MAP login.required 127.0.0.1:80' http://login.required/.pomerium | grep 'User Details Not Available'" ) ''; })