From dcac3ec730176549cd52a9a42db2001dc652c30d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Thu, 7 May 2020 11:58:37 +0200
Subject: Remove overlay that overrides the php version

---
 modules/private/websites/tools/cloud/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to '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 b9bb32f..73a837f 100644
--- a/modules/private/websites/tools/cloud/default.nix
+++ b/modules/private/websites/tools/cloud/default.nix
@@ -11,9 +11,9 @@ let
       [ nextcloud varDir ]
       ++ builtins.attrValues pkgs.webapps.nextcloud-apps);
     phpConfig = ''
-      extension=${pkgs.phpPackages.redis}/lib/php/extensions/redis.so
-      extension=${pkgs.phpPackages.apcu}/lib/php/extensions/apcu.so
-      zend_extension=${pkgs.php}/lib/php/extensions/opcache.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
       '';
     pool = {
       "listen.owner" = "wwwrun";
@@ -38,6 +38,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;
   };
 in {
   options.myServices.websites.tools.cloud = {
@@ -141,8 +142,8 @@ in {
         cd ${nextcloud}
         NEXTCLOUD_CONFIG_DIR="${nextcloud}/config" \
           exec \
-          sudo -u wwwrun ${pkgs.php}/bin/php \
-          -c ${pkgs.php}/etc/php.ini \
+          sudo -u wwwrun ${pkgs.php72}/bin/php \
+          -c ${pkgs.php72}/etc/php.ini \
           occ $*
         '';
     in [ occ ];
@@ -172,6 +173,7 @@ in {
       group = "wwwrun";
       settings = phpFpm.pool;
       phpOptions = config.services.phpfpm.phpOptions + phpFpm.phpConfig;
+      phpPackage = pkgs.php72;
     };
 
     services.cron = {
@@ -181,7 +183,7 @@ in {
           #! ${pkgs.stdenv.shell}
           export LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive
           export PATH=/run/wrappers/bin:$PATH
-          ${pkgs.php}/bin/php -d memory_limit=512M -f ${nextcloud}/cron.php
+          ${pkgs.php72}/bin/php -d memory_limit=512M -f ${nextcloud}/cron.php
           '';
       in [
         ''
-- 
cgit v1.2.3