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

nixos/phpfpm: fix apply global phpOptions

Browse Source
This commit is contained in:
Izorkin 2019-11-04 10:26:41 +03:00
parent 91b01aef66
commit 9a27acedda
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/modules/services/web-servers/phpfpm/default.nix
View File

@ -31,7 +31,7 @@ let
''; '';
passAsFile = [ "nixDefaults" "phpOptions" ]; passAsFile = [ "nixDefaults" "phpOptions" ];
} '' } ''
cat $phpPackage/etc/php.ini $nixDefaultsPath $phpOptionsPath > $out cat ${poolOpts.phpPackage}/etc/php.ini $nixDefaultsPath $phpOptionsPath > $out
''; '';
poolOpts = { name, ... }: poolOpts = { name, ... }:
@ -69,8 +69,6 @@ let
phpOptions = mkOption { phpOptions = mkOption {
type = types.lines; type = types.lines;
default = cfg.phpOptions;
defaultText = "config.services.phpfpm.phpOptions";
description = '' description = ''
"Options appended to the PHP configuration file <filename>php.ini</filename> used for this PHP-FPM pool." "Options appended to the PHP configuration file <filename>php.ini</filename> used for this PHP-FPM pool."
''; '';
@ -137,6 +135,7 @@ let
config = { config = {
socket = if poolOpts.listen == "" then "${runtimeDir}/${name}.sock" else poolOpts.listen; socket = if poolOpts.listen == "" then "${runtimeDir}/${name}.sock" else poolOpts.listen;
group = mkDefault poolOpts.user; group = mkDefault poolOpts.user;
phpOptions = mkBefore cfg.phpOptions;
settings = mapAttrs (name: mkDefault){ settings = mapAttrs (name: mkDefault){
listen = poolOpts.socket; listen = poolOpts.socket;