nixos/nextcloud: move phpPackage and phpOptions into pool

This allows to have a php configuration for nextcloud that is independent
of the global configuration.
This commit is contained in:
Pascal Bach 2019-03-01 16:32:41 +01:00
parent 8f1b163b00
commit f0c0b8d949

View File

@ -360,14 +360,14 @@ in {
}; };
services.phpfpm = { services.phpfpm = {
phpOptions = phpOptionsExtensions;
phpPackage = pkgs.php73;
pools.nextcloud = let pools.nextcloud = let
phpAdminValues = (toKeyValue phpAdminValues = (toKeyValue
(foldr (a: b: a // b) {} (foldr (a: b: a // b) {}
(mapAttrsToList (k: v: { "php_admin_value[${k}]" = v; }) (mapAttrsToList (k: v: { "php_admin_value[${k}]" = v; })
phpOptions))); phpOptions)));
in { in {
phpOptions = phpOptionsExtensions;
phpPackage = pkgs.php73;
listen = "/run/phpfpm/nextcloud"; listen = "/run/phpfpm/nextcloud";
extraConfig = '' extraConfig = ''
listen.owner = nginx listen.owner = nginx