Merge pull request #63867 from etu/phpfpm-missing-variable-fpmCfg

nixos/phpfpm: Remove usage of undefined variable fpmCfg
This commit is contained in:
Graham Christensen 2019-06-27 14:58:33 -04:00 committed by GitHub
commit e961d31d83
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

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