diff options
author | Aaron Andersen <aaron@fosslib.net> | 2019-06-28 21:47:17 -0400 |
---|---|---|
committer | Aaron Andersen <aaron@fosslib.net> | 2019-06-28 21:47:17 -0400 |
commit | 4b98e262a040f69197ad43cd4ec7f9106bf6495d (patch) | |
tree | f6089aade9568573394d40e8f8f892c8c11d6df6 /nixos | |
parent | 8f6c65fa045a492fb5927ddf7c41c3d815075eba (diff) |
Revert "nixos/phpfpm: Remove usage of undefined variable fpmCfg"
This reverts commit 54645ce43a1cd2ecde5f1b6d035366b0311117cf.
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/services/web-servers/phpfpm/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/nixos/modules/services/web-servers/phpfpm/default.nix b/nixos/modules/services/web-servers/phpfpm/default.nix index 5c650210f9f99..e424080ab1f7b 100644 --- a/nixos/modules/services/web-servers/phpfpm/default.nix +++ b/nixos/modules/services/web-servers/phpfpm/default.nix @@ -65,8 +65,8 @@ in { phpPackage = mkOption { type = types.package; - default = pkgs.php; - defaultText = "pkgs.php"; + default = fpmCfg.phpPackage; + defaultText = "config.services.phpfpm.phpPackage"; description = '' The PHP package to use for running this PHP-FPM pool. ''; @@ -74,9 +74,10 @@ in { phpOptions = mkOption { type = types.lines; - default = ""; + default = fpmCfg.phpOptions; + defaultText = "config.services.phpfpm.phpOptions"; 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." ''; }; |