From b69350dee827c52a5693ced6372e2d4e0ce004c3 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 1 Jul 2021 13:58:17 +0200 Subject: [PATCH 1/8] Upgrade to 21.0.3 --- manifest.json | 2 +- scripts/upgrade.d/upgrade.last.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.json b/manifest.json index ccc8955..2d7a9d7 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Online storage, file sharing platform and various other applications", "fr": "Stockage en ligne, plateforme de partage de fichiers et diverses autres applications" }, - "version": "21.0.2~ynh1", + "version": "21.0.3~ynh1", "url": "https://nextcloud.com", "upstream": { "license": "AGPL-3.0", diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index da7061c..72dca50 100755 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,7 +1,7 @@ #!/bin/bash # Last available Nextcloud version -next_version="21.0.2" +next_version="21.0.3" # Nextcloud tarball checksum sha256 -nextcloud_source_sha256="5e5b38109a3485db5fd2d248f24478eabe6c0790ec10b030acbbee207d5511fe" +nextcloud_source_sha256="8adcd175c7a70c33332586fa9ce36d03ba02d1df5d4c334d1210201d3fb953ee" From 5512907d5d57a1d2e5029c31daef7df3e5ffde6c Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Thu, 1 Jul 2021 11:58:25 +0000 Subject: [PATCH 2/8] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4007b2f..3370d99 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Online storage, file sharing platform and various other applications -**Shipped version:** 21.0.2~ynh1 +**Shipped version:** 21.0.3~ynh1 **Demo:** https://demo.nextcloud.com/ diff --git a/README_fr.md b/README_fr.md index aee7890..b338094 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Stockage en ligne, plateforme de partage de fichiers et diverses autres applications -**Version incluse :** 21.0.2~ynh1 +**Version incluse :** 21.0.3~ynh1 **Démo :** https://demo.nextcloud.com/ From a5e7a824b658d3d7a23f2c51e5af30abb7a11c00 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 1 Jul 2021 14:11:52 +0200 Subject: [PATCH 3/8] Update config.json --- conf/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/config.json b/conf/config.json index 70efa3f..28e944d 100644 --- a/conf/config.json +++ b/conf/config.json @@ -1,7 +1,7 @@ { "system": { "updatechecker": false, - "memcache.local": "\\OC\\Memcache\\APCu", + "memcache.local": "\\OC\\Memcache\\Redis", "integrity.check.disabled": true, "filelocking.enabled": true, "memcache.locking": "\\OC\\Memcache\\Redis", From 0f15866d268dc4dd7fb58d080be1c332a68f4bf2 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 1 Jul 2021 15:26:55 +0200 Subject: [PATCH 4/8] Update check_process --- check_process | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/check_process b/check_process index 8d88180..925817e 100644 --- a/check_process +++ b/check_process @@ -12,7 +12,10 @@ setup_private=0 setup_public=0 upgrade=1 - upgrade=1 from_commit=c864e086625363d91dde6ba78a652011a991a027 + #19.0.3 + upgrade=1 from_commit=a03e25fac417e2e03e53ed3a7b7ed05185637360 + #21.0.2 + upgrade=1 from_commit=fa1f0da48d3edbdf5bcb3b8b70a0687b4e878d11 backup_restore=1 multi_instance=1 incorrect_path=1 @@ -22,6 +25,8 @@ Email= Notification=none ;;; Upgrade options - ; commit=c864e086625363d91dde6ba78a652011a991a027 - name=[fix] php7.2-mcrypt doesn't exist (#253) + ; commit=a03e25fac417e2e03e53ed3a7b7ed05185637360 + name=Merge pull request #333 from ericgaspar/Upgrade-to-version-19.0.3 + ; commit=fa1f0da48d3edbdf5bcb3b8b70a0687b4e878d11 + name=Merge pull request #408 from YunoHost-Apps/21.0.2 manifest_arg=domain=DOMAIN&path=PATH&admin=USER&user_home=1& From e53d79db9d71ca604baa54da900708dd4de4e3bc Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 1 Jul 2021 19:22:22 +0200 Subject: [PATCH 5/8] Update config.json --- conf/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/config.json b/conf/config.json index 28e944d..70efa3f 100644 --- a/conf/config.json +++ b/conf/config.json @@ -1,7 +1,7 @@ { "system": { "updatechecker": false, - "memcache.local": "\\OC\\Memcache\\Redis", + "memcache.local": "\\OC\\Memcache\\APCu", "integrity.check.disabled": true, "filelocking.enabled": true, "memcache.locking": "\\OC\\Memcache\\Redis", From 010ddbd369eebfcffb69bb391377de17e3ee8763 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Wed, 7 Jul 2021 12:04:49 +0200 Subject: [PATCH 6/8] enable apc.enable_cli --- conf/extra_php-fpm.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf/extra_php-fpm.conf b/conf/extra_php-fpm.conf index 4b0d12d..adfd579 100644 --- a/conf/extra_php-fpm.conf +++ b/conf/extra_php-fpm.conf @@ -15,3 +15,6 @@ php_value[opcache.max_accelerated_files]=10000 php_value[opcache.memory_consumption]=128 php_value[opcache.save_comments]=1 php_value[opcache.revalidate_freq]=1 +; https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/caching_configuration.html#id1 +php_value[apc.enabled]=1 +php_value[apc.enable_cli]=1 From d9c9c73e7956ab1ab40fb8fbd53853c98f606788 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Fri, 9 Jul 2021 19:04:15 +0200 Subject: [PATCH 7/8] add apc.enable_cli=1 to occ --- scripts/actions/add_multimedia_directories | 2 +- scripts/actions/disable_maintenance | 2 +- scripts/change_url | 2 +- scripts/install | 2 +- scripts/upgrade | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/actions/add_multimedia_directories b/scripts/actions/add_multimedia_directories index 4dc7881..8b5a9af 100755 --- a/scripts/actions/add_multimedia_directories +++ b/scripts/actions/add_multimedia_directories @@ -28,7 +28,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) # Define a function to execute commands with `occ` exec_occ() { (cd "$final_path" && exec_as "$app" \ - php$YNH_PHP_VERSION occ --no-interaction --no-ansi "$@") + php$YNH_PHP_VERSION --define apc.enable_cli=1 occ --no-interaction --no-ansi "$@") } # Define a function to add an external storage diff --git a/scripts/actions/disable_maintenance b/scripts/actions/disable_maintenance index 0ea0edb..60e8738 100755 --- a/scripts/actions/disable_maintenance +++ b/scripts/actions/disable_maintenance @@ -42,7 +42,7 @@ ynh_script_progression --message="Disabling maintenance mode..." --weight=3 ( cd "$final_path" && exec_as "$app" \ - php$YNH_PHP_VERSION occ --no-interaction --no-ansi maintenance:mode --off + php$YNH_PHP_VERSION --define apc.enable_cli=1 occ --no-interaction --no-ansi maintenance:mode --off ) #================================================= diff --git a/scripts/change_url b/scripts/change_url index 5c6deb8..f4f54a2 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -102,7 +102,7 @@ ynh_script_progression --message="Applying Nextcloud specific modifications..." # Define a function to execute commands with `occ` exec_occ() { (cd "$final_path" && ynh_exec_as "$app" \ - php${phpversion} occ --no-interaction --no-ansi "$@") + php${phpversion} --define apc.enable_cli=1 occ --no-interaction --no-ansi "$@") } if [ $change_domain -eq 1 ] diff --git a/scripts/install b/scripts/install index 51d8b0f..1ca2fc6 100755 --- a/scripts/install +++ b/scripts/install @@ -143,7 +143,7 @@ ynh_script_progression --message="Installing Nextcloud..." --weight=30 # Define a function to execute commands with `occ` exec_occ() { (cd "$final_path" && ynh_exec_as "$app" \ - php${phpversion} occ --no-interaction --no-ansi "$@") + php${phpversion} --define apc.enable_cli=1 occ --no-interaction --no-ansi "$@") } # Set write access for the following commands diff --git a/scripts/upgrade b/scripts/upgrade index 205cc51..175c4ee 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -194,7 +194,7 @@ exec_occ() { NEXTCLOUD_PHP_VERSION="7.0" fi (cd "$final_path" && ynh_exec_as "$app" \ - php$NEXTCLOUD_PHP_VERSION occ --no-interaction --no-ansi "$@") + php$NEXTCLOUD_PHP_VERSION --define apc.enable_cli=1 occ --no-interaction --no-ansi "$@") } # Define a function to add an external storage From 51c5b71f2bec6c3a64b649301513712a87ce1794 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Fri, 9 Jul 2021 19:05:43 +0200 Subject: [PATCH 8/8] apc.enable_cli=1 for cron too --- conf/nextcloud.cron | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nextcloud.cron b/conf/nextcloud.cron index e040d0c..13de049 100644 --- a/conf/nextcloud.cron +++ b/conf/nextcloud.cron @@ -1 +1 @@ -*/15 * * * * __APP__ /usr/bin/php__PHPVERSION__ -f __FINAL_PATH__/cron.php +*/15 * * * * __APP__ /usr/bin/php__PHPVERSION__ --define apc.enable_cli=1 -f __FINAL_PATH__/cron.php