colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #189756 from alyssais/mailman-virtualRoot

Browse Source 
nixos/mailman: add serve.virtualRoot option
This commit is contained in:
Maximilian Bosch 2022-11-06 12:42:48 +01:00 committed by GitHub
commit 91d7b27cfb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nixos/modules/services/mail/mailman.nix
View File

@ -263,6 +263,15 @@ in {
serve = {
enable = mkEnableOption (lib.mdDoc "Automatic nginx and uwsgi setup for mailman-web");
virtualRoot = mkOption {
default = "/";
example = lib.literalExpression "/lists";
type = types.str;
description = lib.mdDoc ''
Path to mount the mailman-web django application on.
'';
};
};
extraPythonPackages = mkOption {
@ -433,8 +442,8 @@ in {
enable = mkDefault true;
virtualHosts = lib.genAttrs cfg.webHosts (webHost: {
locations = {
"/".extraConfig = "uwsgi_pass unix:/run/mailman-web.socket;";
"/static/".alias = webSettings.STATIC_ROOT + "/";
${cfg.serve.virtualRoot}.extraConfig = "uwsgi_pass unix:/run/mailman-web.socket;";
"${cfg.serve.virtualRoot}/static/".alias = webSettings.STATIC_ROOT + "/";
};
});
};
@ -561,7 +570,8 @@ in {
type = "normal";
plugins = ["python3"];
home = webEnv;
module = "mailman_web.wsgi";
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);