Merge pull request #209022 from mayflower/fix-mailman-hyperkitty-css

nixos/mailman: fix hyperkitty css/js when virtualRoot is `/`

Changed files
+7 -3
nixos
modules
services
+7 -3
nixos/modules/services/mail/mailman.nix
···
type = "normal";
plugins = ["python3"];
home = webEnv;
-
manage-script-name = true;
-
mount = "${cfg.serve.virtualRoot}=mailman_web.wsgi:application";
http = "127.0.0.1:18507";
-
};
uwsgiConfigFile = pkgs.writeText "uwsgi-mailman.json" (builtins.toJSON uwsgiConfig);
in {
wantedBy = ["multi-user.target"];
···
type = "normal";
plugins = ["python3"];
home = webEnv;
http = "127.0.0.1:18507";
+
}
+
// (if cfg.serve.virtualRoot == "/"
+
then { module = "mailman_web.wsgi:application"; }
+
else {
+
mount = "${cfg.serve.virtualRoot}=mailman_web.wsgi:application";
+
manage-script-name = true;
+
});
uwsgiConfigFile = pkgs.writeText "uwsgi-mailman.json" (builtins.toJSON uwsgiConfig);
in {
wantedBy = ["multi-user.target"];