diff options
author | Aaron Andersen <aaron@fosslib.net> | 2019-07-03 12:11:38 -0400 |
---|---|---|
committer | Aaron Andersen <aaron@fosslib.net> | 2019-08-23 07:54:51 -0400 |
commit | 0ce8317c469872bcb4aed577477676d4148aa1a6 (patch) | |
tree | a0cadfe603dcf68d4bfe67409949ad0000858137 /nixos/modules/services/web-apps/matomo.nix | |
parent | 8f8d9abca4d553f1416c179419f96eba88f36141 (diff) | |
download | nixpkgs-0ce8317c469872bcb4aed577477676d4148aa1a6.tar nixpkgs-0ce8317c469872bcb4aed577477676d4148aa1a6.tar.gz nixpkgs-0ce8317c469872bcb4aed577477676d4148aa1a6.tar.bz2 nixpkgs-0ce8317c469872bcb4aed577477676d4148aa1a6.tar.lz nixpkgs-0ce8317c469872bcb4aed577477676d4148aa1a6.tar.xz nixpkgs-0ce8317c469872bcb4aed577477676d4148aa1a6.tar.zst nixpkgs-0ce8317c469872bcb4aed577477676d4148aa1a6.zip |
nixos/phpfpm: deprecate poolConfigs option
Diffstat (limited to 'nixos/modules/services/web-apps/matomo.nix')
-rw-r--r-- | nixos/modules/services/web-apps/matomo.nix | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/nixos/modules/services/web-apps/matomo.nix b/nixos/modules/services/web-apps/matomo.nix index 14aca45a342..bf8b9dbcc21 100644 --- a/nixos/modules/services/web-apps/matomo.nix +++ b/nixos/modules/services/web-apps/matomo.nix @@ -225,22 +225,24 @@ in { serviceConfig.UMask = "0007"; }; - services.phpfpm.poolConfigs = let + services.phpfpm.pools = let # workaround for when both are null and need to generate a string, # which is illegal, but as assertions apparently are being triggered *after* config generation, # we have to avoid already throwing errors at this previous stage. socketOwner = if (cfg.nginx != null) then config.services.nginx.user else if (cfg.webServerUser != null) then cfg.webServerUser else ""; in { - ${pool} = '' - listen = "${phpSocket}" - listen.owner = ${socketOwner} - listen.group = root - listen.mode = 0600 - user = ${user} - env[PIWIK_USER_PATH] = ${dataDir} - ${cfg.phpfpmProcessManagerConfig} - ''; + ${pool} = { + listen = phpSocket; + extraConfig = '' + listen.owner = ${socketOwner} + listen.group = root + listen.mode = 0600 + user = ${user} + env[PIWIK_USER_PATH] = ${dataDir} + ${cfg.phpfpmProcessManagerConfig} + ''; + }; }; |