From f5761aac8dbfb4af91c232f2b52d1353c899abda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Fri, 8 May 2020 00:43:13 +0200
Subject: Upgrade to latest nixos

---
 modules/private/websites/tools/cloud/default.nix | 10 ++--------
 modules/private/websites/tools/mail/default.nix  |  3 +--
 modules/private/websites/tools/tools/default.nix | 11 +----------
 3 files changed, 4 insertions(+), 20 deletions(-)

(limited to 'modules/private/websites/tools')

diff --git a/modules/private/websites/tools/cloud/default.nix b/modules/private/websites/tools/cloud/default.nix
index 73a837f..0c6bf0d 100644
--- 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 = {
diff --git a/modules/private/websites/tools/mail/default.nix b/modules/private/websites/tools/mail/default.nix
index 217ef1a..7d7904f 100644
--- a/modules/private/websites/tools/mail/default.nix
+++ b/modules/private/websites/tools/mail/default.nix
@@ -64,9 +64,8 @@ in
       settings = roundcubemail.phpFpm.pool;
       phpOptions = config.services.phpfpm.phpOptions + ''
         date.timezone = 'CET'
-        extension=${pkgs.php72Packages.imagick}/lib/php/extensions/imagick.so
       '';
-      phpPackage = pkgs.php72;
+      phpPackage = pkgs.php72.withExtensions(e: pkgs.php72.enabledExtensions ++ [ e.imagick ]);
     };
     services.phpfpm.pools.rainloop = {
       user = "wwwrun";
diff --git a/modules/private/websites/tools/tools/default.nix b/modules/private/websites/tools/tools/default.nix
index dcda15a..bffcf84 100644
--- a/modules/private/websites/tools/tools/default.nix
+++ b/modules/private/websites/tools/tools/default.nix
@@ -317,13 +317,7 @@ in {
 
           "php_admin_value[open_basedir]" = "/run/wrappers/bin/sendmail:/var/lib/ftp/devtools.immae.eu:/tmp";
         };
-        phpOptions = config.services.phpfpm.phpOptions + ''
-          extension=${pkgs.php72}/lib/php/extensions/mysqli.so
-          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
-          '';
-        phpPackage = pkgs.php72;
+        phpPackage = pkgs.php72.withExtensions(e: pkgs.php72.enabledExtensions ++ [e.mysqli e.redis e.apcu e.opcache ]);
       };
       adminer = adminer.phpFpm;
       ttrss = {
@@ -361,9 +355,6 @@ in {
         group = "wwwrun";
         settings = dmarc-reports.phpFpm.pool;
         phpEnv = dmarc-reports.phpFpm.phpEnv;
-        phpOptions = config.services.phpfpm.phpOptions + ''
-          extension=${pkgs.php72}/lib/php/extensions/mysqli.so
-        '';
         phpPackage = pkgs.php72;
       };
       dokuwiki = {
-- 
cgit v1.2.3