From 65b715d7e4a47f00fe0fca6c4b0eaff19e874d38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Thu, 7 May 2020 10:39:56 +0200 Subject: Upgrade nextcloud --- modules/private/websites/tools/cloud/default.nix | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'modules/private') diff --git a/modules/private/websites/tools/cloud/default.nix b/modules/private/websites/tools/cloud/default.nix index 0c6bf0d..3b6a871 100644 --- a/modules/private/websites/tools/cloud/default.nix +++ b/modules/private/websites/tools/cloud/default.nix @@ -1,15 +1,18 @@ { lib, pkgs, config, ... }: let - nextcloud = pkgs.webapps.nextcloud.withApps (builtins.attrValues pkgs.webapps.nextcloud-apps); + nextcloud = pkgs.webapps.nextcloud.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.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 + ]); env = config.myEnv.tools.nextcloud; varDir = "/var/lib/nextcloud"; webappName = "tools_nextcloud"; apacheRoot = "/run/current-system/webapps/${webappName}"; cfg = config.myServices.websites.tools.cloud; phpFpm = rec { - basedir = builtins.concatStringsSep ":" ( - [ nextcloud varDir ] - ++ builtins.attrValues pkgs.webapps.nextcloud-apps); + basedir = builtins.concatStringsSep ":" ([ nextcloud varDir ] ++ nextcloud.apps); pool = { "listen.owner" = "wwwrun"; "listen.group" = "wwwrun"; @@ -33,7 +36,6 @@ 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.withExtensions(e: pkgs.php72.enabledExtensions ++ [ e.redis e.apcu e.opcache ]); }; in { options.myServices.websites.tools.cloud = { @@ -137,8 +139,8 @@ in { cd ${nextcloud} NEXTCLOUD_CONFIG_DIR="${nextcloud}/config" \ exec \ - sudo -u wwwrun ${pkgs.php72}/bin/php \ - -c ${pkgs.php72}/etc/php.ini \ + sudo -u wwwrun ${pkgs.php73}/bin/php \ + -c ${pkgs.php73}/etc/php.ini \ occ $* ''; in [ occ ]; @@ -167,7 +169,7 @@ in { user = "wwwrun"; group = "wwwrun"; settings = phpFpm.pool; - phpPackage = pkgs.php72.withExtensions(e: pkgs.php72.enabledExtensions ++ [ e.redis e.apcu e.opcache ]); + phpPackage = pkgs.php73.withExtensions(e: pkgs.php73.enabledExtensions ++ [ e.redis e.apcu e.opcache ]); }; services.cron = { @@ -177,7 +179,7 @@ in { #! ${pkgs.stdenv.shell} export LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive export PATH=/run/wrappers/bin:$PATH - ${pkgs.php72}/bin/php -d memory_limit=512M -f ${nextcloud}/cron.php + ${pkgs.php73}/bin/php -d memory_limit=512M -f ${nextcloud}/cron.php ''; in [ '' -- cgit v1.2.3