Bump Nextcloud to latest version

[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 134d1bcded9f52782de2fb5f548bc0b8f6bf9942..a09b629e338d874070118e92396122e775a8d377 100644 (file)
--- a/modules/private/websites/tools/cloud/default.nix
+++ b/modules/private/websites/tools/cloud/default.nix
@@ -1,10 +1,14 @@
 { lib, pkgs, config,  ... }:
 let
-  nextcloud = pkgs.webapps.nextcloud.withApps (a: [
+  phpPackage = (pkgs.php74.withExtensions({ enabled, all }: enabled ++ [ all.redis all.apcu all.opcache all.imagick ])).override { extraConfig = ''
+    apc.enable_cli = 1
+    '';
+  };
+  nextcloud = pkgs.webapps.nextcloud_22.withApps (a: [
     a.apporder a.audioplayer a.bookmarks a.calendar a.carnet a.contacts
     a.cookbook a.deck a.extract a.files_markdown a.files_readmemd a.files_mindmap
     a.flowupload a.gpxedit a.gpxpod a.keeweb a.maps a.metadata a.music
-    a.notes a.ocsms a.passman a.polls a.spreed a.tasks
+    a.notes a.passman a.polls a.spreed a.tasks
   ]);
   env = config.myEnv.tools.nextcloud;
   varDir = "/var/lib/nextcloud";
@@ -14,8 +18,11 @@ let
     pool = {
       "listen.owner" = "wwwrun";
       "listen.group" = "wwwrun";
-      "pm" = "ondemand";
+      "pm" = "dynamic";
       "pm.max_children" = "60";
+      "pm.start_servers" = "2";
+      "pm.min_spare_servers" = "2";
+      "pm.max_spare_servers" = "3";
       "pm.process_idle_timeout" = "60";
 
       "php_admin_value[output_buffering]" = "0";
@@ -97,6 +104,9 @@ in {
           'allowZipDownload' => true,
           'forcessl' => true,
           'theme' => ${"''"},
+          'remember_login_cookie_lifetime' => 60*60*24*30,
+          'session_keepalive' => true,
+          'session_lifefime' => 60*60*24*30,
           'maintenance' => false,
           'trusted_domains' => 
           array (
@@ -137,8 +147,8 @@ in {
         cd ${nextcloud}
         NEXTCLOUD_CONFIG_DIR="${nextcloud}/config" \
           exec \
-          sudo -E -u wwwrun ${pkgs.php74}/bin/php \
-          -c ${pkgs.php74}/etc/php.ini \
+          sudo -E -u wwwrun ${phpPackage}/bin/php \
+          -c ${phpPackage}/etc/php.ini \
           occ $*
         '';
     in [ occ ];
@@ -162,7 +172,7 @@ in {
       user = "wwwrun";
       group = "wwwrun";
       settings = phpFpm.pool;
-      phpPackage = pkgs.php74.withExtensions({ enabled, all }: enabled ++ [ all.redis all.apcu all.opcache ]);
+      inherit phpPackage;
     };
 
     services.cron = {
@@ -172,7 +182,7 @@ in {
           #! ${pkgs.stdenv.shell}
           export LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive
           export PATH=/run/wrappers/bin:$PATH
-          ${pkgs.php74}/bin/php -d memory_limit=2048M -f ${nextcloud}/cron.php
+          ${phpPackage}/bin/php -d memory_limit=2048M -f ${nextcloud}/cron.php
           '';
       in [
         ''