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/web-apps/icingaweb2/icingaweb2.nix | |
| parent | d2db3a338c644bfa472005be61323b69b5d29419 (diff) | |
| download | nixpkgs-400c6aac71fb2e190769c288c098d05b258c7543.tar nixpkgs-400c6aac71fb2e190769c288c098d05b258c7543.tar.gz nixpkgs-400c6aac71fb2e190769c288c098d05b258c7543.tar.bz2 nixpkgs-400c6aac71fb2e190769c288c098d05b258c7543.tar.lz nixpkgs-400c6aac71fb2e190769c288c098d05b258c7543.tar.xz nixpkgs-400c6aac71fb2e190769c288c098d05b258c7543.tar.zst nixpkgs-400c6aac71fb2e190769c288c098d05b258c7543.zip | |
nixos/phpfpm: deprecate extraConfig options in favor of settings options
Diffstat (limited to 'nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix')
| -rw-r--r-- | nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix b/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix index 35a7badfd63..95c8fb16051 100644 --- a/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix +++ b/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix @@ -166,26 +166,24 @@ in { config = mkIf cfg.enable { services.phpfpm.pools = mkIf (cfg.pool == "${poolName}") { "${poolName}" = { - extraConfig = '' - listen.owner = nginx - listen.group = nginx - listen.mode = 0600 - user = icingaweb2 - pm = dynamic - pm.max_children = 75 - pm.start_servers = 2 - pm.min_spare_servers = 2 - pm.max_spare_servers = 10 + user = "icingaweb2"; + phpOptions = '' + extension = ${pkgs.phpPackages.imagick}/lib/php/extensions/imagick.so + date.timezone = "${cfg.timezone}" ''; + settings = mapAttrs (name: mkDefault) { + "listen.owner" = "nginx"; + "listen.group" = "nginx"; + "listen.mode" = "0600"; + "pm" = "dynamic"; + "pm.max_children" = 75; + "pm.start_servers" = 2; + "pm.min_spare_servers" = 2; + "pm.max_spare_servers" = 10; + }; }; }; - services.phpfpm.phpOptions = mkIf (cfg.pool == "${poolName}") - '' - extension = ${pkgs.phpPackages.imagick}/lib/php/extensions/imagick.so - date.timezone = "${cfg.timezone}" - ''; - systemd.services."phpfpm-${poolName}".serviceConfig.ReadWritePaths = [ "/etc/icingaweb2" ]; services.nginx = { |