Upgrade to latest nixos

[perso/Immae/Config/Nix.git] / modules / private / websites / tools / cloud / default.nix

diff --git a/modules/private/websites/tools/cloud/default.nix b/modules/private/websites/tools/cloud/default.nix
index 73a837f575c1c8e1a781aaeb6ca1c561b92c78e8..0c6bf0d5ee55dd60c68a3a0137845700c1fd1871 100644 (file)
--- a/modules/private/websites/tools/cloud/default.nix
+++ b/modules/private/websites/tools/cloud/default.nix
@@ -10,11 +10,6 @@ let
     basedir = builtins.concatStringsSep ":" (
       [ nextcloud varDir ]
       ++ builtins.attrValues pkgs.webapps.nextcloud-apps);
-    phpConfig = ''
-      extension=${pkgs.php72Packages.redis}/lib/php/extensions/redis.so
-      extension=${pkgs.php72Packages.apcu}/lib/php/extensions/apcu.so
-      zend_extension=${pkgs.php72}/lib/php/extensions/opcache.so
-      '';
     pool = {
       "listen.owner" = "wwwrun";
       "listen.group" = "wwwrun";
@@ -38,7 +33,7 @@ let
       "php_admin_value[open_basedir]" = "/run/wrappers/bin/sendmail:${basedir}:/proc/meminfo:/dev/urandom:/proc/self/fd:/tmp";
       "php_admin_value[session.save_path]" = "${varDir}/phpSessions";
     };
-    phpPackage = pkgs.php72;
+    phpPackage = pkgs.php72.withExtensions(e: pkgs.php72.enabledExtensions ++ [ e.redis e.apcu e.opcache ]);
   };
 in {
   options.myServices.websites.tools.cloud = {
@@ -172,8 +167,7 @@ in {
       user = "wwwrun";
       group = "wwwrun";
       settings = phpFpm.pool;
-      phpOptions = config.services.phpfpm.phpOptions + phpFpm.phpConfig;
-      phpPackage = pkgs.php72;
+      phpPackage = pkgs.php72.withExtensions(e: pkgs.php72.enabledExtensions ++ [ e.redis e.apcu e.opcache ]);
     };
 
     services.cron = {