diff options
| author | Robin Gloster <mail@glob.in> | 2023-01-05 17:29:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-05 17:29:08 +0100 |
| commit | 271c20dd406d486cc184f71b256a24ca04e73eb5 (patch) | |
| tree | 91448f07300c9396476c2aef4f3dcd0180272cba /nixos/modules/services/mail | |
| parent | 272763effc43f23bec6f1e17ff3948f1ffc96093 (diff) | |
| parent | 05f6dd4dc685ed874c20195792907ecf71d5ef00 (diff) | |
| download | nixpkgs-271c20dd406d486cc184f71b256a24ca04e73eb5.tar nixpkgs-271c20dd406d486cc184f71b256a24ca04e73eb5.tar.gz nixpkgs-271c20dd406d486cc184f71b256a24ca04e73eb5.tar.bz2 nixpkgs-271c20dd406d486cc184f71b256a24ca04e73eb5.tar.lz nixpkgs-271c20dd406d486cc184f71b256a24ca04e73eb5.tar.xz nixpkgs-271c20dd406d486cc184f71b256a24ca04e73eb5.tar.zst nixpkgs-271c20dd406d486cc184f71b256a24ca04e73eb5.zip | |
Merge pull request #209022 from mayflower/fix-mailman-hyperkitty-css
nixos/mailman: fix hyperkitty css/js when virtualRoot is `/`
Diffstat (limited to 'nixos/modules/services/mail')
| -rw-r--r-- | nixos/modules/services/mail/mailman.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix index 0ca87696b14..2adc7427abf 100644 --- a/nixos/modules/services/mail/mailman.nix +++ b/nixos/modules/services/mail/mailman.nix @@ -570,10 +570,14 @@ in { type = "normal"; plugins = ["python3"]; home = webEnv; - manage-script-name = true; - mount = "${cfg.serve.virtualRoot}=mailman_web.wsgi:application"; 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"]; |