summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorPascal Bach <pascal.bach@nextrem.ch>2019-03-01 16:32:41 +0100
committerPascal Bach <pascal.bach@nextrem.ch>2019-03-02 00:16:56 +0100
commitf0c0b8d949c753d53e9f04ecfb43583fb44c20b2 (patch)
tree995c3738f2086dee8899595adbff2bce57974acd /nixos
parent8f1b163b003aa315b8d9e071df9a013875218769 (diff)
downloadnixpkgs-f0c0b8d949c753d53e9f04ecfb43583fb44c20b2.tar
nixpkgs-f0c0b8d949c753d53e9f04ecfb43583fb44c20b2.tar.gz
nixpkgs-f0c0b8d949c753d53e9f04ecfb43583fb44c20b2.tar.bz2
nixpkgs-f0c0b8d949c753d53e9f04ecfb43583fb44c20b2.tar.lz
nixpkgs-f0c0b8d949c753d53e9f04ecfb43583fb44c20b2.tar.xz
nixpkgs-f0c0b8d949c753d53e9f04ecfb43583fb44c20b2.tar.zst
nixpkgs-f0c0b8d949c753d53e9f04ecfb43583fb44c20b2.zip
nixos/nextcloud: move phpPackage and phpOptions into pool
This allows to have a php configuration for nextcloud that is independent
of the global configuration.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/web-apps/nextcloud.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index f1ef9aa3593..64e4a25037f 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -360,14 +360,14 @@ in {
       };
 
       services.phpfpm = {
-        phpOptions = phpOptionsExtensions;
-        phpPackage = pkgs.php73;
         pools.nextcloud = let
           phpAdminValues = (toKeyValue
             (foldr (a: b: a // b) {}
               (mapAttrsToList (k: v: { "php_admin_value[${k}]" = v; })
                 phpOptions)));
         in {
+          phpOptions = phpOptionsExtensions;
+          phpPackage = pkgs.php73;
           listen = "/run/phpfpm/nextcloud";
           extraConfig = ''
             listen.owner = nginx