nixos/phpfpm: add user and group option to each pool

This commit is contained in:
Aaron Andersen 2019-08-02 20:56:13 -04:00
parent 62b774a700
commit a30a1e2795
2 changed files with 16 additions and 4 deletions

View File

@ -203,11 +203,10 @@ in
}; };
services.phpfpm.pools.limesurvey = { services.phpfpm.pools.limesurvey = {
inherit user group;
extraConfig = '' extraConfig = ''
listen.owner = ${config.services.httpd.user}; listen.owner = ${config.services.httpd.user};
listen.group = ${config.services.httpd.group}; listen.group = ${config.services.httpd.group};
user = ${user};
group = ${group};
env[LIMESURVEY_CONFIG] = ${limesurveyConfig} env[LIMESURVEY_CONFIG] = ${limesurveyConfig}

View File

@ -15,6 +15,8 @@ let
[${pool}] [${pool}]
listen = ${poolOpts.socket} listen = ${poolOpts.socket}
user = ${poolOpts.user}
group = ${poolOpts.group}
${poolOpts.extraConfig} ${poolOpts.extraConfig}
''; '';
@ -71,10 +73,19 @@ let
''; '';
}; };
user = mkOption {
type = types.str;
description = "User account under which this pool runs.";
};
group = mkOption {
type = types.str;
description = "Group account under which this pool runs.";
};
extraConfig = mkOption { extraConfig = mkOption {
type = types.lines; type = types.lines;
example = '' example = ''
user = nobody
pm = dynamic pm = dynamic
pm.max_children = 75 pm.max_children = 75
pm.start_servers = 10 pm.start_servers = 10
@ -93,6 +104,7 @@ let
config = { config = {
socket = if poolOpts.listen == "" then "${stateDir}/${name}.sock" else poolOpts.listen; socket = if poolOpts.listen == "" then "${stateDir}/${name}.sock" else poolOpts.listen;
group = mkDefault poolOpts.user;
}; };
}; };
@ -138,9 +150,10 @@ in {
example = literalExample '' example = literalExample ''
{ {
mypool = { mypool = {
user = "php";
group = "php";
phpPackage = pkgs.php; phpPackage = pkgs.php;
extraConfig = ''' extraConfig = '''
user = nobody
pm = dynamic pm = dynamic
pm.max_children = 75 pm.max_children = 75
pm.start_servers = 10 pm.start_servers = 10