diff options
| author | Aaron Andersen <aaron@fosslib.net> | 2019-08-07 22:36:49 -0400 |
|---|---|---|
| committer | Aaron Andersen <aaron@fosslib.net> | 2019-08-23 07:56:27 -0400 |
| commit | 400c6aac71fb2e190769c288c098d05b258c7543 (patch) | |
| tree | 24b427392c5557b5f9f96e6eb600317d474d5627 /nixos/modules/services/misc/zoneminder.nix | |
| parent | d2db3a338c644bfa472005be61323b69b5d29419 (diff) | |
| download | nixlib-400c6aac71fb2e190769c288c098d05b258c7543.tar nixlib-400c6aac71fb2e190769c288c098d05b258c7543.tar.gz nixlib-400c6aac71fb2e190769c288c098d05b258c7543.tar.bz2 nixlib-400c6aac71fb2e190769c288c098d05b258c7543.tar.lz nixlib-400c6aac71fb2e190769c288c098d05b258c7543.tar.xz nixlib-400c6aac71fb2e190769c288c098d05b258c7543.tar.zst nixlib-400c6aac71fb2e190769c288c098d05b258c7543.zip | |
nixos/phpfpm: deprecate extraConfig options in favor of settings options
Diffstat (limited to 'nixos/modules/services/misc/zoneminder.nix')
| -rw-r--r-- | nixos/modules/services/misc/zoneminder.nix | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/nixos/modules/services/misc/zoneminder.nix b/nixos/modules/services/misc/zoneminder.nix index ee94d8a06b5d..6e83d47df1ca 100644 --- a/nixos/modules/services/misc/zoneminder.nix +++ b/nixos/modules/services/misc/zoneminder.nix @@ -283,29 +283,27 @@ in { phpfpm = lib.mkIf useNginx { pools.zoneminder = { + inherit user group; phpOptions = '' date.timezone = "${config.time.timeZone}" ${lib.concatStringsSep "\n" (map (e: "extension=${e.pkg}/lib/php/extensions/${e.name}.so") phpExtensions)} ''; - extraConfig = '' - user = ${user} - group = ${group} - - listen.owner = ${user} - listen.group = ${group} - listen.mode = 0660 - - pm = dynamic - pm.start_servers = 1 - pm.min_spare_servers = 1 - pm.max_spare_servers = 2 - pm.max_requests = 500 - pm.max_children = 5 - pm.status_path = /$pool-status - ping.path = /$pool-ping - ''; + settings = lib.mapAttrs (name: lib.mkDefault) { + "listen.owner" = user; + "listen.group" = group; + "listen.mode" = "0660"; + + "pm" = "dynamic"; + "pm.start_servers" = 1; + "pm.min_spare_servers" = 1; + "pm.max_spare_servers" = 2; + "pm.max_requests" = 500; + "pm.max_children" = 5; + "pm.status_path" = "/$pool-status"; + "ping.path" = "/$pool-ping"; + }; }; }; }; |