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

nixos/mailman: add webUser option

Browse Source 
Not everybody is using Apache.
This commit is contained in:
Alyssa Ross 2019-10-20 02:33:12 +00:00
parent 30bfbe7e81
commit 547b91b971
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,6 +120,14 @@ in {
''; '';
}; };
webUser = mkOption {
type = types.str;
default = config.services.httpd.user;
description = ''
User to run mailman-web as
'';
};
hyperkittyBaseUrl = mkOption { hyperkittyBaseUrl = mkOption {
type = types.str; type = types.str;
default = "http://localhost/hyperkitty/"; default = "http://localhost/hyperkitty/";
@ -197,7 +205,7 @@ in {
${mailmanWebExe}/bin/mailman-web compress ${mailmanWebExe}/bin/mailman-web compress
''; '';
serviceConfig = { serviceConfig = {
User = config.services.httpd.user; User = cfg.webUser;
Type = "oneshot"; Type = "oneshot";
StateDirectory = "mailman-web"; StateDirectory = "mailman-web";
StateDirectoryMode = "0700"; StateDirectoryMode = "0700";
@ -221,7 +229,7 @@ in {
wantedBy = [ "mailman.service" "multi-user.target" ]; wantedBy = [ "mailman.service" "multi-user.target" ];
serviceConfig = { serviceConfig = {
ExecStart = "${mailmanWebExe}/bin/mailman-web qcluster"; ExecStart = "${mailmanWebExe}/bin/mailman-web qcluster";
User = config.services.httpd.user; User = cfg.webUser;
WorkingDirectory = "/var/lib/mailman-web"; WorkingDirectory = "/var/lib/mailman-web";
}; };
}; };
@ -232,7 +240,7 @@ in {
startAt = "minutely"; startAt = "minutely";
serviceConfig = { serviceConfig = {
ExecStart = "${mailmanWebExe}/bin/mailman-web runjobs minutely"; ExecStart = "${mailmanWebExe}/bin/mailman-web runjobs minutely";
User = config.services.httpd.user; User = cfg.webUser;
WorkingDirectory = "/var/lib/mailman-web"; WorkingDirectory = "/var/lib/mailman-web";
}; };
}; };
@ -243,7 +251,7 @@ in {
startAt = "*:00/15"; startAt = "*:00/15";
serviceConfig = { serviceConfig = {
ExecStart = "${mailmanWebExe}/bin/mailman-web runjobs quarter_hourly"; ExecStart = "${mailmanWebExe}/bin/mailman-web runjobs quarter_hourly";
User = config.services.httpd.user; User = cfg.webUser;
WorkingDirectory = "/var/lib/mailman-web"; WorkingDirectory = "/var/lib/mailman-web";
}; };
}; };
@ -254,7 +262,7 @@ in {
startAt = "hourly"; startAt = "hourly";
serviceConfig = { serviceConfig = {
ExecStart = "${mailmanWebExe}/bin/mailman-web runjobs hourly"; ExecStart = "${mailmanWebExe}/bin/mailman-web runjobs hourly";
User = config.services.httpd.user; User = cfg.webUser;
WorkingDirectory = "/var/lib/mailman-web"; WorkingDirectory = "/var/lib/mailman-web";
}; };
}; };
@ -265,7 +273,7 @@ in {
startAt = "daily"; startAt = "daily";
serviceConfig = { serviceConfig = {
ExecStart = "${mailmanWebExe}/bin/mailman-web runjobs daily"; ExecStart = "${mailmanWebExe}/bin/mailman-web runjobs daily";
User = config.services.httpd.user; User = cfg.webUser;
WorkingDirectory = "/var/lib/mailman-web"; WorkingDirectory = "/var/lib/mailman-web";
}; };
}; };
@ -276,7 +284,7 @@ in {
startAt = "weekly"; startAt = "weekly";
serviceConfig = { serviceConfig = {
ExecStart = "${mailmanWebExe}/bin/mailman-web runjobs weekly"; ExecStart = "${mailmanWebExe}/bin/mailman-web runjobs weekly";
User = config.services.httpd.user; User = cfg.webUser;
WorkingDirectory = "/var/lib/mailman-web"; WorkingDirectory = "/var/lib/mailman-web";
}; };
}; };
@ -287,7 +295,7 @@ in {
startAt = "yearly"; startAt = "yearly";
serviceConfig = { serviceConfig = {
ExecStart = "${mailmanWebExe}/bin/mailman-web runjobs yearly"; ExecStart = "${mailmanWebExe}/bin/mailman-web runjobs yearly";
User = config.services.httpd.user; User = cfg.webUser;
WorkingDirectory = "/var/lib/mailman-web"; WorkingDirectory = "/var/lib/mailman-web";
}; };
}; };