cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Revert "nixos/phpfpm: Remove usage of undefined variable fpmCfg"

Browse source 
This reverts commit 54645ce43a.
This commit is contained in:
Aaron Andersen 2019-06-28 21:47:17 -04:00
parent 8f6c65fa04
commit 4b98e262a0
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
nixos/modules/services/web-servers/phpfpm/default.nix
View file

@ -65,8 +65,8 @@ in {
phpPackage = mkOption { phpPackage = mkOption {
type = types.package; type = types.package;
default = pkgs.php; default = fpmCfg.phpPackage;
defaultText = "pkgs.php"; defaultText = "config.services.phpfpm.phpPackage";
description = '' description = ''
The PHP package to use for running this PHP-FPM pool. The PHP package to use for running this PHP-FPM pool.
''; '';
@ -74,9 +74,10 @@ in {
phpOptions = mkOption { phpOptions = mkOption {
type = types.lines; type = types.lines;
default = ""; default = fpmCfg.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."
''; '';
}; };