diff --git a/mail-server/rspamd.nix b/mail-server/rspamd.nix index 0b856ea..6a8cb15 100644 --- a/mail-server/rspamd.nix +++ b/mail-server/rspamd.nix @@ -59,7 +59,6 @@ in enable = true; virtualHosts = { "${cfg.rspamdWebUI.domain}" = { - forceSSL = true; locations."/".proxyPass = "http://unix:/run/rspamd/worker-controller.sock:/"; }; }; diff --git a/tests/internal.nix b/tests/internal.nix index 5835ce6..b64173f 100644 --- a/tests/internal.nix +++ b/tests/internal.nix @@ -81,6 +81,11 @@ pkgs.nixosTest { vmailUID = 5000; enableImap = false; + + rspamdWebUI = { + enable = true; + domain = "localhost"; + }; }; }; }; @@ -185,6 +190,11 @@ pkgs.nixosTest { "set +o pipefail; ${pkgs.curl}/bin/curl --unix-socket /run/rspamd/worker-controller.sock http://localhost/ | grep -q ''" ) + with subtest("nginx serves web ui"): + machine.succeed( + "set +o pipefail; ${pkgs.curl}/bin/curl http://localhost/ | grep -q ''" + ) + with subtest("imap port 143 is closed and imaps is serving SSL"): machine.wait_for_closed_port(143) machine.wait_for_open_port(993)