diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-10-20 02:33:12 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-12-16 22:03:26 +0000 |
commit | 2ddaa2ab35aebff4e359079c39ff4c56bbbe647c (patch) | |
tree | 10c5fe477e21c291318e4e15eb2a33709e79da71 /nixpkgs/nixos/modules/services/mail | |
parent | d5bf1fb4a66b62170732893a7bbdfd78d4c27727 (diff) | |
download | nixlib-2ddaa2ab35aebff4e359079c39ff4c56bbbe647c.tar nixlib-2ddaa2ab35aebff4e359079c39ff4c56bbbe647c.tar.gz nixlib-2ddaa2ab35aebff4e359079c39ff4c56bbbe647c.tar.bz2 nixlib-2ddaa2ab35aebff4e359079c39ff4c56bbbe647c.tar.lz nixlib-2ddaa2ab35aebff4e359079c39ff4c56bbbe647c.tar.xz nixlib-2ddaa2ab35aebff4e359079c39ff4c56bbbe647c.tar.zst nixlib-2ddaa2ab35aebff4e359079c39ff4c56bbbe647c.zip |
nixos/mailman: add webUser option
Not everybody is using Apache.
Diffstat (limited to 'nixpkgs/nixos/modules/services/mail')
-rw-r--r-- | nixpkgs/nixos/modules/services/mail/mailman.nix | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/nixpkgs/nixos/modules/services/mail/mailman.nix b/nixpkgs/nixos/modules/services/mail/mailman.nix index e917209f3d1f..3a69cc746227 100644 --- a/nixpkgs/nixos/modules/services/mail/mailman.nix +++ b/nixpkgs/nixos/modules/services/mail/mailman.nix @@ -120,6 +120,14 @@ in { ''; }; + webUser = mkOption { + type = types.str; + default = config.services.httpd.user; + description = '' + User to run mailman-web as + ''; + }; + hyperkittyBaseUrl = mkOption { type = types.str; default = "http://localhost/hyperkitty/"; @@ -197,7 +205,7 @@ in { ${mailmanWebExe}/bin/mailman-web compress ''; serviceConfig = { - User = config.services.httpd.user; + User = cfg.webUser; Type = "oneshot"; StateDirectory = "mailman-web"; StateDirectoryMode = "0700"; @@ -221,7 +229,7 @@ in { wantedBy = [ "mailman.service" "multi-user.target" ]; serviceConfig = { ExecStart = "${mailmanWebExe}/bin/mailman-web qcluster"; - User = config.services.httpd.user; + User = cfg.webUser; WorkingDirectory = "/var/lib/mailman-web"; }; }; @@ -232,7 +240,7 @@ in { startAt = "minutely"; serviceConfig = { ExecStart = "${mailmanWebExe}/bin/mailman-web runjobs minutely"; - User = config.services.httpd.user; + User = cfg.webUser; WorkingDirectory = "/var/lib/mailman-web"; }; }; @@ -243,7 +251,7 @@ in { startAt = "*:00/15"; serviceConfig = { ExecStart = "${mailmanWebExe}/bin/mailman-web runjobs quarter_hourly"; - User = config.services.httpd.user; + User = cfg.webUser; WorkingDirectory = "/var/lib/mailman-web"; }; }; @@ -254,7 +262,7 @@ in { startAt = "hourly"; serviceConfig = { ExecStart = "${mailmanWebExe}/bin/mailman-web runjobs hourly"; - User = config.services.httpd.user; + User = cfg.webUser; WorkingDirectory = "/var/lib/mailman-web"; }; }; @@ -265,7 +273,7 @@ in { startAt = "daily"; serviceConfig = { ExecStart = "${mailmanWebExe}/bin/mailman-web runjobs daily"; - User = config.services.httpd.user; + User = cfg.webUser; WorkingDirectory = "/var/lib/mailman-web"; }; }; @@ -276,7 +284,7 @@ in { startAt = "weekly"; serviceConfig = { ExecStart = "${mailmanWebExe}/bin/mailman-web runjobs weekly"; - User = config.services.httpd.user; + User = cfg.webUser; WorkingDirectory = "/var/lib/mailman-web"; }; }; @@ -287,7 +295,7 @@ in { startAt = "yearly"; serviceConfig = { ExecStart = "${mailmanWebExe}/bin/mailman-web runjobs yearly"; - User = config.services.httpd.user; + User = cfg.webUser; WorkingDirectory = "/var/lib/mailman-web"; }; }; |