From a90582bb9313819833d30298d8460dc756a7d270 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 30 Nov 2021 23:45:52 +0100 Subject: [PATCH 01/52] 23.0.0 --- manifest.json | 2 +- scripts/upgrade.d/upgrade.22.sh | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 scripts/upgrade.d/upgrade.22.sh diff --git a/manifest.json b/manifest.json index f65f6d3..d2cfb2c 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": "22.2.3~ynh1", + "version": "22.3.0~ynh1", "url": "https://nextcloud.com", "upstream": { "license": "AGPL-3.0", diff --git a/scripts/upgrade.d/upgrade.22.sh b/scripts/upgrade.d/upgrade.22.sh new file mode 100644 index 0000000..78a70e2 --- /dev/null +++ b/scripts/upgrade.d/upgrade.22.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +# Last available nextcloud version +next_version="23.0.0" + +# Nextcloud tarball checksum sha256 +nextcloud_source_sha256="c37592abc3b65c8fd28459281a24f414b87af52fc8c2ea979be3f9be75d01a2c" From fa6cdc738b9571182e1ca9bf08f21e9b70a9688c Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Tue, 30 Nov 2021 22:46:00 +0000 Subject: [PATCH 02/52] 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 193b7e9..29ecf6c 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:** 22.2.3~ynh1 +**Shipped version:** 22.3.0~ynh1 **Demo:** https://demo.nextcloud.com/ diff --git a/README_fr.md b/README_fr.md index d4fa816..e6ef5c7 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 :** 22.2.3~ynh1 +**Version incluse :** 22.3.0~ynh1 **Démo :** https://demo.nextcloud.com/ From 02d6b0520290702b1ecaa9ceff66b5c56c826bc1 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 30 Nov 2021 23:50:39 +0100 Subject: [PATCH 03/52] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index d2cfb2c..7c498c0 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": "22.3.0~ynh1", + "version": "23.0.0~ynh1", "url": "https://nextcloud.com", "upstream": { "license": "AGPL-3.0", From 323f3b53f0aafda0378c0f895059ba058fbe0e76 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Tue, 30 Nov 2021 22:50:52 +0000 Subject: [PATCH 04/52] 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 29ecf6c..f9b8a0e 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:** 22.3.0~ynh1 +**Shipped version:** 23.0.0~ynh1 **Demo:** https://demo.nextcloud.com/ diff --git a/README_fr.md b/README_fr.md index e6ef5c7..25deed6 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 :** 22.3.0~ynh1 +**Version incluse :** 23.0.0~ynh1 **Démo :** https://demo.nextcloud.com/ From 2ea16519922ee7f8c468cf5e07026d4b77a7cfd8 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 1 Dec 2021 00:08:24 +0100 Subject: [PATCH 05/52] Update upgrade.last.sh --- scripts/upgrade.d/upgrade.last.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index b210a00..81844ab 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="22.2.3" +next_version="23.0.0" # Nextcloud tarball checksum sha256 -nextcloud_source_sha256="66a29a6a490738c0abedb677cb68c7c91fabab3e6419a3c99d8b406899eb942a" +nextcloud_source_sha256="c37592abc3b65c8fd28459281a24f414b87af52fc8c2ea979be3f9be75d01a2c" From 51947bca96faf143e7cb3fa101bb60bbbfe44353 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 2 Dec 2021 23:03:41 +0100 Subject: [PATCH 06/52] PHP8 --- config_panel.toml | 2 +- manifest.json | 2 +- scripts/_common.sh | 2 +- scripts/config | 8 +------- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/config_panel.toml b/config_panel.toml index 9c73626..af33ccf 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -1,4 +1,4 @@ -version = "0.1" +version = "1.0" name = "Nextcloud configuration panel" [main] diff --git a/manifest.json b/manifest.json index 7c498c0..7c38085 100644 --- a/manifest.json +++ b/manifest.json @@ -27,7 +27,7 @@ "multi_instance": true, "services": [ "nginx", - "php7.3-fpm", + "php8.0-fpm", "mysql" ], "arguments": { diff --git a/scripts/_common.sh b/scripts/_common.sh index 84a585a..50e6812 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -3,7 +3,7 @@ # COMMON VARIABLES #================================================= -YNH_PHP_VERSION="7.3" +YNH_PHP_VERSION="8.0" pkg_dependencies="imagemagick libmagickcore-6.q16-6-extra acl tar smbclient at php${YNH_PHP_VERSION}-bz2 php${YNH_PHP_VERSION}-imap php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-apcu php${YNH_PHP_VERSION}-redis php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-igbinary php${YNH_PHP_VERSION}-bcmath" #================================================= diff --git a/scripts/config b/scripts/config index 0c14bca..221cbf1 100644 --- a/scripts/config +++ b/scripts/config @@ -89,10 +89,4 @@ apply_config() { #================================================= # GENERIC FINALIZATION #================================================= -# SELECT THE ACTION FOLLOWING THE GIVEN ARGUMENT -#================================================= - -case $1 in - show) show_config;; - apply) apply_config;; -esac +ynh_app_config_run $1 From ed772c35be31700c9885b6316c786c76dbd56bb4 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 2 Dec 2021 23:13:12 +0100 Subject: [PATCH 07/52] Update install --- scripts/install | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index 3ed8f22..1c4dc3d 100755 --- a/scripts/install +++ b/scripts/install @@ -25,6 +25,7 @@ path_url=$YNH_APP_ARG_PATH admin=$YNH_APP_ARG_ADMIN user_home=$YNH_APP_ARG_USER_HOME is_public=$YNH_APP_ARG_IS_PUBLIC +phpversion=$YNH_PHP_VERSION app=$YNH_APP_INSTANCE_NAME @@ -48,6 +49,7 @@ ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url ynh_app_setting_set --app=$app --key=admin --value=$admin ynh_app_setting_set --app=$app --key=user_home --value=$user_home +ynh_app_setting_set --app=$app --key=phpversion --value=$phpversion #================================================= # STANDARD MODIFICATIONS @@ -104,9 +106,7 @@ ynh_system_user_create --username=$app ynh_script_progression --message="Configuring PHP-FPM..." --weight=50 # Create a dedicated php-fpm config -ynh_add_fpm_config --usage=medium --footprint=high --phpversion=$YNH_PHP_VERSION -# Used by ynh_add_nginx_config -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) +ynh_add_fpm_config --usage=medium --footprint=high #================================================= # NGINX CONFIGURATION From 9a62d330cde2a1dbd085859b1f4f52bccbe4fca1 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 3 Dec 2021 15:07:15 +0100 Subject: [PATCH 08/52] Update config_panel.toml --- config_panel.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/config_panel.toml b/config_panel.toml index af33ccf..acc6ffb 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -1,5 +1,4 @@ version = "1.0" -name = "Nextcloud configuration panel" [main] name = "Nextcloud configuration" From d8bc23f1b754c3dec944a9a58ebbf2f3a7755fcb Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 5 Dec 2021 10:40:14 +0100 Subject: [PATCH 09/52] Update config_panel.toml --- config_panel.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config_panel.toml b/config_panel.toml index 9c73626..af33ccf 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -1,4 +1,4 @@ -version = "0.1" +version = "1.0" name = "Nextcloud configuration panel" [main] From 3a1e36e0ce46ed94377e2e029c6d1a27883f7f2d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 5 Dec 2021 10:40:46 +0100 Subject: [PATCH 10/52] Update config --- scripts/config | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/scripts/config b/scripts/config index 0c14bca..221cbf1 100644 --- a/scripts/config +++ b/scripts/config @@ -89,10 +89,4 @@ apply_config() { #================================================= # GENERIC FINALIZATION #================================================= -# SELECT THE ACTION FOLLOWING THE GIVEN ARGUMENT -#================================================= - -case $1 in - show) show_config;; - apply) apply_config;; -esac +ynh_app_config_run $1 From 71d79b0567342bbfac4e448af0a457e1d77b6184 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 5 Dec 2021 10:40:58 +0100 Subject: [PATCH 11/52] Update config_panel.toml --- config_panel.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/config_panel.toml b/config_panel.toml index af33ccf..acc6ffb 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -1,5 +1,4 @@ version = "1.0" -name = "Nextcloud configuration panel" [main] name = "Nextcloud configuration" From 54f03e58334d372d80ee0a3f153d5f249e7c03e8 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 5 Dec 2021 18:20:19 +0100 Subject: [PATCH 12/52] Update check_process --- check_process | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/check_process b/check_process index ea81cc6..b04125f 100644 --- a/check_process +++ b/check_process @@ -14,7 +14,7 @@ setup_public=1 upgrade=1 #21.0.2 - upgrade=1 from_commit=fa1f0da48d3edbdf5bcb3b8b70a0687b4e878d11 + upgrade=1 from_commit=e249cced99423d8e6743312361f140c1fbdc3a1d backup_restore=1 multi_instance=1 incorrect_path=1 @@ -24,6 +24,6 @@ Email= Notification=none ;;; Upgrade options - ; commit=fa1f0da48d3edbdf5bcb3b8b70a0687b4e878d11 - name=Merge pull request #408 from YunoHost-Apps/21.0.2 + ; commit=e249cced99423d8e6743312361f140c1fbdc3a1d + name=Merge pull request #446 from YunoHost-Apps/22.2.0 manifest_arg=domain=DOMAIN&path=PATH&admin=USER&user_home=1& From 3f3e936ef65717a5687339c18621cad1d9e487b4 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 8 Dec 2021 11:54:46 +0100 Subject: [PATCH 13/52] Update install --- scripts/install | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/install b/scripts/install index 1c4dc3d..c3a1d2e 100755 --- a/scripts/install +++ b/scripts/install @@ -49,7 +49,6 @@ ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url ynh_app_setting_set --app=$app --key=admin --value=$admin ynh_app_setting_set --app=$app --key=user_home --value=$user_home -ynh_app_setting_set --app=$app --key=phpversion --value=$phpversion #================================================= # STANDARD MODIFICATIONS From b5c21f0c3d981eeacaa690c01147ba9e7ad17478 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Wed, 8 Dec 2021 15:17:53 +0100 Subject: [PATCH 14/52] Upgrade config panel --- config_panel.toml | 4 +- scripts/_common.sh | 1 + scripts/config | 117 +++++++++++++++++++++++---------------------- 3 files changed, 63 insertions(+), 59 deletions(-) diff --git a/config_panel.toml b/config_panel.toml index acc6ffb..dc5ced4 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -6,7 +6,7 @@ name = "Nextcloud configuration" [main.php_fpm_config] name = "PHP-FPM configuration" - [main.php_fpm_config.footprint] + [main.php_fpm_config.fpm_footprint] ask = "Memory footprint of the service?" choices = ["low", "medium", "high", "specific"] default = "low" @@ -18,7 +18,7 @@ name = "Nextcloud configuration" default = "0" help = "Free field to specify exactly the footprint in Mb if you don't want to use one of the three previous values." - [main.php_fpm_config.usage] + [main.php_fpm_config.fpm_usage] ask = "Expected usage of the service?" choices = ["low", "medium", "high"] default = "low" diff --git a/scripts/_common.sh b/scripts/_common.sh index 50e6812..ce10116 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -1,3 +1,4 @@ +#!/bin/bash #================================================= # COMMON VARIABLES diff --git a/scripts/config b/scripts/config index 221cbf1..3440bd2 100644 --- a/scripts/config +++ b/scripts/config @@ -9,84 +9,87 @@ source _common.sh source /usr/share/yunohost/helpers +ynh_abort_if_errors + #================================================= # RETRIEVE ARGUMENTS #================================================= -app=$YNH_APP_INSTANCE_NAME - phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) +current_fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint) #================================================= -# LOAD VALUES +# SPECIFIC GETTERS FOR TOML SHORT KEY #================================================= -# Load the real value from the app config or elsewhere. -# Then get the value from the form. -# If the form has a value for a variable, take the value from the form, -# Otherwise, keep the value from the app config. +get__fpm_footprint() { + # Free footprint value for php-fpm + # Check if current_fpm_footprint is an integer + if [ "$current_fpm_footprint" -eq "$current_fpm_footprint" ] 2> /dev/null + then + echo "specific" + else + echo "$current_fpm_footprint" + fi +} -# Footprint for php-fpm -old_fpm_footprint="$(ynh_app_setting_get --app=$app --key=fpm_footprint)" -fpm_footprint="${YNH_CONFIG_MAIN_PHP_FPM_CONFIG_FOOTPRINT:-$old_fpm_footprint}" - -# Free footprint value for php-fpm -# Check if fpm_footprint is an integer -if [ "$fpm_footprint" -eq "$fpm_footprint" ] 2> /dev/null -then - # If fpm_footprint is an integer, that's a numeric value for the footprint - old_free_footprint=$fpm_footprint - fpm_footprint=specific -else - old_free_footprint=0 -fi -free_footprint="${YNH_CONFIG_MAIN_PHP_FPM_CONFIG_FREE_FOOTPRINT:-$old_free_footprint}" - -# Usage for php-fpm -old_fpm_usage="$(ynh_app_setting_get --app=$app --key=fpm_usage)" -fpm_usage="${YNH_CONFIG_MAIN_PHP_FPM_CONFIG_USAGE:-$old_fpm_usage}" - -#================================================= -# SHOW_CONFIG FUNCTION FOR 'SHOW' COMMAND -#================================================= - -show_config() { - # here you are supposed to read some config file/database/other then print the values - # ynh_return "YNH_CONFIG_${PANEL_ID}_${SECTION_ID}_${OPTION_ID}=value" - - ynh_return "YNH_CONFIG_MAIN_PHP_FPM_CONFIG_FOOTPRINT=$fpm_footprint" - ynh_return "YNH_CONFIG_MAIN_PHP_FPM_CONFIG_FREE_FOOTPRINT=$free_footprint" - ynh_return "YNH_CONFIG_MAIN_PHP_FPM_CONFIG_USAGE=$fpm_usage" +get__free_footprint() { + # Free footprint value for php-fpm + # Check if current_fpm_footprint is an integer + if [ "$current_fpm_footprint" -eq "$current_fpm_footprint" ] 2> /dev/null + then + # If current_fpm_footprint is an integer, that's a numeric value for the footprint + echo "$current_fpm_footprint" + else + echo "0" + fi } #================================================= -# MODIFY THE CONFIGURATION +# SPECIFIC SETTERS FOR TOML SHORT KEYS #================================================= -apply_config() { - - #================================================= - # RECONFIGURE PHP-FPM - #================================================= - - if [ "$fpm_usage" != "$old_fpm_usage" ] || [ "$fpm_footprint" != "$old_fpm_footprint" ] || [ "$free_footprint" != "$old_free_footprint" ] +set__fpm_footprint() { + if [ "$fpm_footprint" != "specific" ] then - # If fpm_footprint is set to 'specific', use $free_footprint value. - if [ "$fpm_footprint" = "specific" ] - then - fpm_footprint=$free_footprint - fi + ynh_app_setting_set --app=$app --key=fpm_footprint --value="$fpm_footprint" + fi +} - if [ "$fpm_footprint" != "0" ] - then - ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint --package="$extra_php_dependencies" - else - ynh_print_err --message="When selecting 'specific', you have to set a footprint value into the field below." - fi +set__free_footprint() { + if [ "$fpm_footprint" = "specific" ] + then + ynh_app_setting_set --app=$app --key=fpm_footprint --value="$free_footprint" fi } #================================================= # GENERIC FINALIZATION #================================================= + +ynh_app_config_validate() { + _ynh_app_config_validate + + if [ "${changed[fpm_usage]}" == "true" ] || [ "${changed[fpm_footprint]}" == "true" ] || [ "${changed[free_footprint]}" == "true" ]; then + # If fpm_footprint is set to 'specific', use $free_footprint value. + if [ "$fpm_footprint" = "specific" ] + then + fpm_footprint=$free_footprint + fi + + if [ "$fpm_footprint" == "0" ] + then + ynh_print_err --message="When selecting 'specific', you have to set a footprint value into the field below." + + exit 0 + fi + fi +} + +ynh_app_config_apply() { + _ynh_app_config_apply + + ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint +} + ynh_app_config_run $1 From 74a1c7851292cf18522a5faa37bac153409cd237 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 8 Dec 2021 22:41:56 +0100 Subject: [PATCH 15/52] small typo --- config_panel.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config_panel.toml b/config_panel.toml index dc5ced4..d6d0dd9 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -22,4 +22,4 @@ name = "Nextcloud configuration" ask = "Expected usage of the service?" choices = ["low", "medium", "high"] default = "low" - help = "low: Personal usage, behind the sso. No RAM footprint when not used, but the impact on the processor can be high if many users are using the service.
medium: Low usage, few people or/and publicly accessible. Low RAM footprint, medium processor footprint when used.
high: High usage, frequently visited website. High RAM footprint, but lower on processor usage and quickly responding." + help = "low: Personal usage, behind the SSO. No RAM footprint when not used, but the impact on the processor can be high if many users are using the service.
medium: Low usage, few people or/and publicly accessible. Low RAM footprint, medium processor footprint when used.
high: High usage, frequently visited website. High RAM footprint, but lower on processor usage and quickly responding." From cb51384c7c6e9c259bfee332c88ba285f54269e8 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Mon, 17 Jan 2022 17:41:37 +0100 Subject: [PATCH 16/52] fix the upgrade, needs https://github.com/YunoHost/yunohost/commit/6ea327282875d06367612cd4cf06775fcc65efb7 --- scripts/upgrade | 31 +++++++------------------------ 1 file changed, 7 insertions(+), 24 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index f4b2bae..c2a731a 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -22,7 +22,6 @@ admin=$(ynh_app_setting_get --app=$app --key=admin) final_path=$(ynh_app_setting_get --app=$app --key=final_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) user_home=$(ynh_app_setting_get --app=$app --key=user_home) -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint) fpm_usage=$(ynh_app_setting_get --app=$app --key=fpm_usage) @@ -71,11 +70,6 @@ if [ -z "$fpm_usage" ]; then ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage fi -# If phpversion doesn't exist, create it -if [ -z "$phpversion" ]; then - phpversion="$YNH_PHP_VERSION" -fi - # Cleaning legacy permissions if ynh_legacy_permissions_exists; then ynh_legacy_permissions_delete_all @@ -88,6 +82,11 @@ if ! ynh_permission_exists --permission="api"; then ynh_permission_create --permission="api" --label="api" --url="re:$domain\/.well-known\/.*" --allowed="visitors" "all_users" --auth_header="false" --show_tile="false" --protected="true" fi +# Delete existing ini configuration file (backward compatibility) +if [ -f /etc/php/$YNH_PHP_VERSION/fpm/conf.d/20-$app.ini ]; then + ynh_secure_remove --file=/etc/php/$YNH_PHP_VERSION/fpm/conf.d/20-$app.ini +fi + #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= @@ -148,26 +147,10 @@ ynh_system_user_create --username=$app #================================================= ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2 -# If php has changed, remove the old fpm config file -if [ "$phpversion" != $YNH_PHP_VERSION ] -then - ynh_backup_if_checksum_is_different --file="/etc/php/$phpversion/fpm/pool.d/$app.conf" - ynh_secure_remove --file="/etc/php/$phpversion/fpm/pool.d/$app.conf" - if [ -f /etc/php/$phpversion/fpm/conf.d/20-$app.ini ]; then - ynh_secure_remove --file="/etc/php/$phpversion/fpm/conf.d/20-$app.ini" - fi - ynh_systemd_action --service_name="php${phpversion}-fpm" --action=reload - - phpversion="$YNH_PHP_VERSION" -fi - # Recreate a dedicated PHP-FPM config -ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint +ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint -# Delete existing ini configuration file (backward compatibility) -if [ -f /etc/php/$phpversion/fpm/conf.d/20-$app.ini ]; then - ynh_secure_remove --file=/etc/php/$phpversion/fpm/conf.d/20-$app.ini -fi +phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # NGINX CONFIGURATION From 62d58c73c7e00a4504fa34c8dece66484c118b07 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 28 Jan 2022 08:16:18 +0100 Subject: [PATCH 17/52] 23.0.1 --- manifest.json | 2 +- scripts/upgrade.d/upgrade.22.sh | 2 +- scripts/upgrade.d/upgrade.last.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifest.json b/manifest.json index 7c38085..eb71312 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": "23.0.0~ynh1", + "version": "23.0.1~ynh1", "url": "https://nextcloud.com", "upstream": { "license": "AGPL-3.0", diff --git a/scripts/upgrade.d/upgrade.22.sh b/scripts/upgrade.d/upgrade.22.sh index 78a70e2..81844ab 100644 --- a/scripts/upgrade.d/upgrade.22.sh +++ b/scripts/upgrade.d/upgrade.22.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Last available nextcloud version +# Last available Nextcloud version next_version="23.0.0" # Nextcloud tarball checksum sha256 diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 81844ab..8b7e2b6 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="23.0.0" +next_version="23.0.1" # Nextcloud tarball checksum sha256 -nextcloud_source_sha256="c37592abc3b65c8fd28459281a24f414b87af52fc8c2ea979be3f9be75d01a2c" +nextcloud_source_sha256="5e753cd458f355be08c0bfa6531172bad5ffda9cbc0d405f52c0e544eeb4f710" From 676dd6b379bed09d541a27df67e34bd0ceb96cdc Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Fri, 28 Jan 2022 07:16:25 +0000 Subject: [PATCH 18/52] 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 f9b8a0e..1874214 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:** 23.0.0~ynh1 +**Shipped version:** 23.0.1~ynh1 **Demo:** https://demo.nextcloud.com/ diff --git a/README_fr.md b/README_fr.md index 25deed6..ecd46b0 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 :** 23.0.0~ynh1 +**Version incluse :** 23.0.1~ynh1 **Démo :** https://demo.nextcloud.com/ From e6df7b5f7c6dbdcab1947984e21bfdbc2d0d1f67 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 28 Jan 2022 09:35:21 +0100 Subject: [PATCH 19/52] Remove php8.0-json virtual package --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index ce10116..250f8b5 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ #================================================= YNH_PHP_VERSION="8.0" -pkg_dependencies="imagemagick libmagickcore-6.q16-6-extra acl tar smbclient at php${YNH_PHP_VERSION}-bz2 php${YNH_PHP_VERSION}-imap php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-apcu php${YNH_PHP_VERSION}-redis php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-igbinary php${YNH_PHP_VERSION}-bcmath" +pkg_dependencies="imagemagick libmagickcore-6.q16-6-extra acl tar smbclient at php${YNH_PHP_VERSION}-bz2 php${YNH_PHP_VERSION}-imap php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-apcu php${YNH_PHP_VERSION}-redis php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-igbinary php${YNH_PHP_VERSION}-bcmath" #================================================= # EXPERIMENTAL HELPERS From 3471c0124fb4dbd5ffb1e8ff31d5c2389552d3bd Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 28 Jan 2022 11:16:26 +0100 Subject: [PATCH 20/52] Revert "Remove php8.0-json virtual package" This reverts commit e6df7b5f7c6dbdcab1947984e21bfdbc2d0d1f67. --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 250f8b5..ce10116 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ #================================================= YNH_PHP_VERSION="8.0" -pkg_dependencies="imagemagick libmagickcore-6.q16-6-extra acl tar smbclient at php${YNH_PHP_VERSION}-bz2 php${YNH_PHP_VERSION}-imap php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-apcu php${YNH_PHP_VERSION}-redis php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-igbinary php${YNH_PHP_VERSION}-bcmath" +pkg_dependencies="imagemagick libmagickcore-6.q16-6-extra acl tar smbclient at php${YNH_PHP_VERSION}-bz2 php${YNH_PHP_VERSION}-imap php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-apcu php${YNH_PHP_VERSION}-redis php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-igbinary php${YNH_PHP_VERSION}-bcmath" #================================================= # EXPERIMENTAL HELPERS From 47d510450434522932caa4c2d9c9bd3cfebec312 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Tue, 1 Feb 2022 13:40:01 +0100 Subject: [PATCH 21/52] Typos / suggestions from code review Co-authored-by: Tagada <36127788+Tagadda@users.noreply.github.com> --- scripts/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/config b/scripts/config index 3440bd2..8a9110c 100644 --- a/scripts/config +++ b/scripts/config @@ -57,7 +57,7 @@ set__fpm_footprint() { } set__free_footprint() { - if [ "$fpm_footprint" = "specific" ] + if [ "$fpm_footprint" == "specific" ] then ynh_app_setting_set --app=$app --key=fpm_footprint --value="$free_footprint" fi @@ -72,7 +72,7 @@ ynh_app_config_validate() { if [ "${changed[fpm_usage]}" == "true" ] || [ "${changed[fpm_footprint]}" == "true" ] || [ "${changed[free_footprint]}" == "true" ]; then # If fpm_footprint is set to 'specific', use $free_footprint value. - if [ "$fpm_footprint" = "specific" ] + if [ "$fpm_footprint" == "specific" ] then fpm_footprint=$free_footprint fi From e660bbd7d2f545171ca71408e36c4e2081f3520f Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 19 Feb 2022 15:11:17 +0100 Subject: [PATCH 22/52] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 7c38085..6925f33 100644 --- a/manifest.json +++ b/manifest.json @@ -18,7 +18,7 @@ }, "license": "AGPL-3.0", "maintainer": { - "name": "Kay0u", + "name": "kay0u", "email": "pierre@kayou.io" }, "requirements": { From e762cefac254a9237ea099d7e0b4f034053eaea2 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 19 Feb 2022 15:16:32 +0100 Subject: [PATCH 23/52] 23.0.2 --- 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 eb71312..b767af4 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": "23.0.1~ynh1", + "version": "23.0.2~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 8b7e2b6..15bd3d0 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="23.0.1" +next_version="23.0.2" # Nextcloud tarball checksum sha256 -nextcloud_source_sha256="5e753cd458f355be08c0bfa6531172bad5ffda9cbc0d405f52c0e544eeb4f710" +nextcloud_source_sha256="9e02462d38eaab6457fca8077bd46fe78c3aaad442e91a6e12e32fa7d51bc4ee" From e891d61947ec7b5d22a09f1768d792f77118a6d5 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Sat, 19 Feb 2022 14:16:37 +0000 Subject: [PATCH 24/52] 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 1874214..3956130 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:** 23.0.1~ynh1 +**Shipped version:** 23.0.2~ynh1 **Demo:** https://demo.nextcloud.com/ diff --git a/README_fr.md b/README_fr.md index ecd46b0..0097a19 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 :** 23.0.1~ynh1 +**Version incluse :** 23.0.2~ynh1 **Démo :** https://demo.nextcloud.com/ From 07d6a1c0d21f364cdc2e7e9ae7cda13270d652f8 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 20 Feb 2022 11:30:56 +0100 Subject: [PATCH 25/52] Update check_process --- check_process | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/check_process b/check_process index b04125f..a84eaa5 100644 --- a/check_process +++ b/check_process @@ -15,6 +15,8 @@ upgrade=1 #21.0.2 upgrade=1 from_commit=e249cced99423d8e6743312361f140c1fbdc3a1d + #22.2.3 + upgrade=1 from_commit=892f02888f31b6a0da850a5f8b2e66a151f84750 backup_restore=1 multi_instance=1 incorrect_path=1 @@ -25,5 +27,7 @@ Email= Notification=none ;;; Upgrade options ; commit=e249cced99423d8e6743312361f140c1fbdc3a1d - name=Merge pull request #446 from YunoHost-Apps/22.2.0 + name=Merge pull request #446 from YunoHost-Apps/22.2.0 + ; commit=892f02888f31b6a0da850a5f8b2e66a151f84750 + name=Merge pull request #457 from YunoHost-Apps/testing manifest_arg=domain=DOMAIN&path=PATH&admin=USER&user_home=1& From a19fc34d51e199481f1a4533850436d787ae4f8f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 20 Feb 2022 11:31:15 +0100 Subject: [PATCH 26/52] Update check_process --- check_process | 2 -- 1 file changed, 2 deletions(-) diff --git a/check_process b/check_process index a84eaa5..eef530d 100644 --- a/check_process +++ b/check_process @@ -19,8 +19,6 @@ upgrade=1 from_commit=892f02888f31b6a0da850a5f8b2e66a151f84750 backup_restore=1 multi_instance=1 - incorrect_path=1 - port_already_use=0 change_url=1 ;;; Options Email= From 17fb87ed033baabb0efbf6dde3548726fb403594 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 20 Feb 2022 11:35:15 +0100 Subject: [PATCH 27/52] Update upgrade --- scripts/upgrade | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index c2a731a..05cd44b 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -22,6 +22,7 @@ admin=$(ynh_app_setting_get --app=$app --key=admin) final_path=$(ynh_app_setting_get --app=$app --key=final_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) user_home=$(ynh_app_setting_get --app=$app --key=user_home) +phpversion=$YNH_PHP_VERSION fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint) fpm_usage=$(ynh_app_setting_get --app=$app --key=fpm_usage) @@ -83,8 +84,8 @@ if ! ynh_permission_exists --permission="api"; then fi # Delete existing ini configuration file (backward compatibility) -if [ -f /etc/php/$YNH_PHP_VERSION/fpm/conf.d/20-$app.ini ]; then - ynh_secure_remove --file=/etc/php/$YNH_PHP_VERSION/fpm/conf.d/20-$app.ini +if [ -f /etc/php/7.3/fpm/conf.d/20-$app.ini ]; then + ynh_secure_remove --file=/etc/php/7.3/fpm/conf.d/20-$app.ini fi #================================================= @@ -150,8 +151,6 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2 # Recreate a dedicated PHP-FPM config ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) - #================================================= # NGINX CONFIGURATION #================================================= From 20eba34949dfd6149f9dc33fabc67a8f048cfa5d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 20 Feb 2022 15:00:37 +0100 Subject: [PATCH 28/52] Revert "Update upgrade" This reverts commit 17fb87ed033baabb0efbf6dde3548726fb403594. --- scripts/upgrade | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 05cd44b..c2a731a 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -22,7 +22,6 @@ admin=$(ynh_app_setting_get --app=$app --key=admin) final_path=$(ynh_app_setting_get --app=$app --key=final_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) user_home=$(ynh_app_setting_get --app=$app --key=user_home) -phpversion=$YNH_PHP_VERSION fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint) fpm_usage=$(ynh_app_setting_get --app=$app --key=fpm_usage) @@ -84,8 +83,8 @@ if ! ynh_permission_exists --permission="api"; then fi # Delete existing ini configuration file (backward compatibility) -if [ -f /etc/php/7.3/fpm/conf.d/20-$app.ini ]; then - ynh_secure_remove --file=/etc/php/7.3/fpm/conf.d/20-$app.ini +if [ -f /etc/php/$YNH_PHP_VERSION/fpm/conf.d/20-$app.ini ]; then + ynh_secure_remove --file=/etc/php/$YNH_PHP_VERSION/fpm/conf.d/20-$app.ini fi #================================================= @@ -151,6 +150,8 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2 # Recreate a dedicated PHP-FPM config ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint +phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) + #================================================= # NGINX CONFIGURATION #================================================= From 2ce0b6ce5dd7edd1193a96a65b94f6bc850fc975 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 28 Feb 2022 23:59:12 +0100 Subject: [PATCH 29/52] Update _common.sh --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index ce10116..250f8b5 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ #================================================= YNH_PHP_VERSION="8.0" -pkg_dependencies="imagemagick libmagickcore-6.q16-6-extra acl tar smbclient at php${YNH_PHP_VERSION}-bz2 php${YNH_PHP_VERSION}-imap php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-apcu php${YNH_PHP_VERSION}-redis php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-igbinary php${YNH_PHP_VERSION}-bcmath" +pkg_dependencies="imagemagick libmagickcore-6.q16-6-extra acl tar smbclient at php${YNH_PHP_VERSION}-bz2 php${YNH_PHP_VERSION}-imap php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-apcu php${YNH_PHP_VERSION}-redis php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-igbinary php${YNH_PHP_VERSION}-bcmath" #================================================= # EXPERIMENTAL HELPERS From c40a2aa594dd3ac00585c1542b1d0365a4402340 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Tue, 1 Mar 2022 21:46:17 +0100 Subject: [PATCH 30/52] Drop requirement for JSON extension in PHP8.0 --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index ce10116..250f8b5 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ #================================================= YNH_PHP_VERSION="8.0" -pkg_dependencies="imagemagick libmagickcore-6.q16-6-extra acl tar smbclient at php${YNH_PHP_VERSION}-bz2 php${YNH_PHP_VERSION}-imap php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-apcu php${YNH_PHP_VERSION}-redis php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-igbinary php${YNH_PHP_VERSION}-bcmath" +pkg_dependencies="imagemagick libmagickcore-6.q16-6-extra acl tar smbclient at php${YNH_PHP_VERSION}-bz2 php${YNH_PHP_VERSION}-imap php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-apcu php${YNH_PHP_VERSION}-redis php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-igbinary php${YNH_PHP_VERSION}-bcmath" #================================================= # EXPERIMENTAL HELPERS From 6821819ffe1691e3bc95a3b6cba613ab806408b2 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 3 Mar 2022 09:41:01 +0100 Subject: [PATCH 31/52] Use 7.4 --- scripts/_common.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 250f8b5..f3a8b5a 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,8 +4,8 @@ # COMMON VARIABLES #================================================= -YNH_PHP_VERSION="8.0" -pkg_dependencies="imagemagick libmagickcore-6.q16-6-extra acl tar smbclient at php${YNH_PHP_VERSION}-bz2 php${YNH_PHP_VERSION}-imap php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-apcu php${YNH_PHP_VERSION}-redis php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-igbinary php${YNH_PHP_VERSION}-bcmath" +YNH_PHP_VERSION="7.4" +pkg_dependencies="imagemagick libmagickcore-6.q16-6-extra acl tar smbclient at php${YNH_PHP_VERSION}-bz2 php${YNH_PHP_VERSION}-imap php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-apcu php${YNH_PHP_VERSION}-redis php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-igbinary php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-json" #================================================= # EXPERIMENTAL HELPERS From f288496cce4850608d0455ba956aee9ee7247b52 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 3 Mar 2022 09:41:22 +0100 Subject: [PATCH 32/52] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 8af4ca4..cfce173 100644 --- a/manifest.json +++ b/manifest.json @@ -27,7 +27,7 @@ "multi_instance": true, "services": [ "nginx", - "php8.0-fpm", + "php7.4-fpm", "mysql" ], "arguments": { From be0382957fc3f6541fcd95f63991875f5802a2e4 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 3 Mar 2022 18:08:11 +0100 Subject: [PATCH 33/52] Revert "Use 7.4" This reverts commit 6821819ffe1691e3bc95a3b6cba613ab806408b2. --- scripts/_common.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index f3a8b5a..250f8b5 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,8 +4,8 @@ # COMMON VARIABLES #================================================= -YNH_PHP_VERSION="7.4" -pkg_dependencies="imagemagick libmagickcore-6.q16-6-extra acl tar smbclient at php${YNH_PHP_VERSION}-bz2 php${YNH_PHP_VERSION}-imap php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-apcu php${YNH_PHP_VERSION}-redis php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-igbinary php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-json" +YNH_PHP_VERSION="8.0" +pkg_dependencies="imagemagick libmagickcore-6.q16-6-extra acl tar smbclient at php${YNH_PHP_VERSION}-bz2 php${YNH_PHP_VERSION}-imap php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-apcu php${YNH_PHP_VERSION}-redis php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-igbinary php${YNH_PHP_VERSION}-bcmath" #================================================= # EXPERIMENTAL HELPERS From 67108cfef1659a9a180a41e59c5cf49093be5b44 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 3 Mar 2022 18:09:09 +0100 Subject: [PATCH 34/52] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index cfce173..8af4ca4 100644 --- a/manifest.json +++ b/manifest.json @@ -27,7 +27,7 @@ "multi_instance": true, "services": [ "nginx", - "php7.4-fpm", + "php8.0-fpm", "mysql" ], "arguments": { From 435aec44153765c2237de428d8e3b55bcab6f3bb Mon Sep 17 00:00:00 2001 From: Kay0u Date: Mon, 7 Mar 2022 14:54:24 +0100 Subject: [PATCH 35/52] Bump ynh requirement --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 8af4ca4..3f7f492 100644 --- a/manifest.json +++ b/manifest.json @@ -22,7 +22,7 @@ "email": "pierre@kayou.io" }, "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.0.4" }, "multi_instance": true, "services": [ From 20019d006e4c0c9cb24a0a33e866449d5f0eec61 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 21 Mar 2022 17:53:33 +0100 Subject: [PATCH 36/52] 23.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 3f7f492..35c63e6 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": "23.0.2~ynh1", + "version": "23.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 15bd3d0..90ffd44 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="23.0.2" +next_version="23.0.3" # Nextcloud tarball checksum sha256 -nextcloud_source_sha256="9e02462d38eaab6457fca8077bd46fe78c3aaad442e91a6e12e32fa7d51bc4ee" +nextcloud_source_sha256="39401d400fab02a84a175ea6e995b8ed4110fbaea48c876230b4f09755a62986" From db2cd5254b6d4eb1bf77166146f5d1da631bfb64 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 21 Mar 2022 16:53:41 +0000 Subject: [PATCH 37/52] 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 3956130..8af8838 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:** 23.0.2~ynh1 +**Shipped version:** 23.0.3~ynh1 **Demo:** https://demo.nextcloud.com/ diff --git a/README_fr.md b/README_fr.md index 0097a19..49702a1 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 :** 23.0.2~ynh1 +**Version incluse :** 23.0.3~ynh1 **Démo :** https://demo.nextcloud.com/ From fa6ee993081d2dd95cbebfc70f207d4269d9aa7b Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 21 Apr 2022 18:53:24 +0200 Subject: [PATCH 38/52] 23.0.4 --- 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 35c63e6..5587e75 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": "23.0.3~ynh1", + "version": "23.0.4~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 90ffd44..69d8a8c 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="23.0.3" +next_version="23.0.4" # Nextcloud tarball checksum sha256 -nextcloud_source_sha256="39401d400fab02a84a175ea6e995b8ed4110fbaea48c876230b4f09755a62986" +nextcloud_source_sha256="67191c2b8b41591ae42accfb32216313fde0e107201682cb39029f890712bc6a" From 323d14f5fc51e55f41747adb6b1d7f93a5645101 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 21 Apr 2022 16:53:31 +0000 Subject: [PATCH 39/52] 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 8af8838..4e4ab68 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:** 23.0.3~ynh1 +**Shipped version:** 23.0.4~ynh1 **Demo:** https://demo.nextcloud.com/ diff --git a/README_fr.md b/README_fr.md index 49702a1..f138534 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 :** 23.0.3~ynh1 +**Version incluse :** 23.0.4~ynh1 **Démo :** https://demo.nextcloud.com/ From 2ea3bdaae37c60af178431dc1e117f5a9902bb24 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 22 Apr 2022 23:10:06 +0200 Subject: [PATCH 40/52] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 5587e75..53672fb 100644 --- a/manifest.json +++ b/manifest.json @@ -22,7 +22,7 @@ "email": "pierre@kayou.io" }, "requirements": { - "yunohost": ">= 11.0.4" + "yunohost": ">= 4.3.0" }, "multi_instance": true, "services": [ From 0c2933c10e8a52ea9fe5f9d12948cf9490cb3394 Mon Sep 17 00:00:00 2001 From: Kayou Date: Thu, 28 Apr 2022 14:49:51 +0200 Subject: [PATCH 41/52] Apply suggestions from code review --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 53672fb..5587e75 100644 --- a/manifest.json +++ b/manifest.json @@ -22,7 +22,7 @@ "email": "pierre@kayou.io" }, "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.0.4" }, "multi_instance": true, "services": [ From 380274e7ae0ac4651a2384b10f3c400ed67a8196 Mon Sep 17 00:00:00 2001 From: Nicolas Frandeboeuf Date: Mon, 9 May 2022 06:56:08 +0000 Subject: [PATCH 42/52] Remove default expires policy in nginx (breaking API calls by caching them) (fix #484) --- conf/nginx.conf | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index af84758..2678d48 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -8,7 +8,7 @@ location ^~ /.well-known { location = /.well-known/carddav { return 301 __PATH__/remote.php/dav/; } location = /.well-known/caldav { return 301 __PATH__/remote.php/dav/; } - + location = /.well-known/webfinger { return 301 __PATH__/index.php$uri; } location = /.well-known/nodeinfo { return 301 __PATH__/index.php$uri; } @@ -62,9 +62,6 @@ location ^~ __PATH__/ { # always provides the desired behaviour. index index.php index.html __PATH__/index.php$request_uri; - # Default Cache-Control policy - expires 1m; - # Rule borrowed from `.htaccess` to handle Microsoft DAV clients location = __PATH__/ { if ( $http_user_agent ~ ^DavClnt ) { From 83d4b3dfdb742f5032131059ccc9a7a1cd851403 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 1 Jul 2022 13:12:51 +0000 Subject: [PATCH 43/52] Auto-update README --- README.md | 21 +++++++++++---------- README_fr.md | 27 ++++++++++++++++----------- 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 4e4ab68..4af0111 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Nextcloud for YunoHost -[![Integration level](https://dash.yunohost.org/integration/nextcloud.svg)](https://dash.yunohost.org/appci/app/nextcloud) ![](https://ci-apps.yunohost.org/ci/badges/nextcloud.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/nextcloud.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/nextcloud.svg)](https://dash.yunohost.org/appci/app/nextcloud) ![Working status](https://ci-apps.yunohost.org/ci/badges/nextcloud.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/nextcloud.maintain.svg) [![Install Nextcloud with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=nextcloud) *[Lire ce readme en français.](./README_fr.md)* @@ -23,7 +23,7 @@ Online storage, file sharing platform and various other applications ## Screenshots -![](./doc/screenshots/screenshot.png) +![Screenshot of Nextcloud](./doc/screenshots/screenshot.png) ## Disclaimers / important information @@ -53,22 +53,23 @@ this package: ## Documentation and resources -* Official app website: https://nextcloud.com -* Official user documentation: https://docs.nextcloud.com/server/latest/user_manual/en/ -* Official admin documentation: https://docs.nextcloud.com/server/stable/admin_manual/ -* Upstream app code repository: https://github.com/nextcloud/server -* YunoHost documentation for this app: https://yunohost.org/app_nextcloud -* Report a bug: https://github.com/YunoHost-Apps/nextcloud_ynh/issues +* Official app website: +* Official user documentation: +* Official admin documentation: +* Upstream app code repository: +* YunoHost documentation for this app: +* Report a bug: ## Developer info Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing --debug or sudo yunohost app upgrade nextcloud -u https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing --debug ``` -**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index f138534..13787ed 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,10 +1,14 @@ + + # Nextcloud pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/nextcloud.svg)](https://dash.yunohost.org/appci/app/nextcloud) ![](https://ci-apps.yunohost.org/ci/badges/nextcloud.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/nextcloud.maintain.svg) +[![Niveau d'intégration](https://dash.yunohost.org/integration/nextcloud.svg)](https://dash.yunohost.org/appci/app/nextcloud) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/nextcloud.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/nextcloud.maintain.svg) [![Installer Nextcloud avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=nextcloud) *[Read this readme in english.](./README.md)* -*[Lire ce readme en français.](./README_fr.md)* > *Ce package vous permet d'installer Nextcloud rapidement et simplement sur un serveur YunoHost. Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* @@ -19,7 +23,7 @@ Stockage en ligne, plateforme de partage de fichiers et diverses autres applicat ## Captures d'écran -![](./doc/screenshots/screenshot.png) +![Capture d'écran de Nextcloud](./doc/screenshots/screenshot.png) ## Avertissements / informations importantes @@ -48,22 +52,23 @@ En plus des fonctionnalités principales de Nextcloud, les fonctionnalités suiv ## Documentations et ressources -* Site officiel de l'app : https://nextcloud.com -* Documentation officielle utilisateur : https://docs.nextcloud.com/server/latest/user_manual/en/ -* Documentation officielle de l'admin : https://docs.nextcloud.com/server/stable/admin_manual/ -* Dépôt de code officiel de l'app : https://github.com/nextcloud/server -* Documentation YunoHost pour cette app : https://yunohost.org/app_nextcloud -* Signaler un bug : https://github.com/YunoHost-Apps/nextcloud_ynh/issues +* Site officiel de l'app : +* Documentation officielle utilisateur : +* Documentation officielle de l'admin : +* Dépôt de code officiel de l'app : +* Documentation YunoHost pour cette app : +* Signaler un bug : ## Informations pour les développeurs Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing --debug ou sudo yunohost app upgrade nextcloud -u https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file +**Plus d'infos sur le packaging d'applications :** From ccbdbec1d95c2c46ebd97436294f06a94d452497 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 15 Jul 2022 16:13:10 +0200 Subject: [PATCH 44/52] Upgrade to 23.0.6 --- 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 5587e75..c4f47ed 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": "23.0.4~ynh1", + "version": "23.0.6~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 69d8a8c..c25ca50 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="23.0.4" +next_version="23.0.6" # Nextcloud tarball checksum sha256 -nextcloud_source_sha256="67191c2b8b41591ae42accfb32216313fde0e107201682cb39029f890712bc6a" +nextcloud_source_sha256="34fbc3a6c16a623f57971b8c4df7c5e62b3650728edec7d05ec116b295040548" From 8f1d61b9cc9c91ff126de6ac5dd96bfc19961f0b Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 15 Jul 2022 14:13:16 +0000 Subject: [PATCH 45/52] 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 4af0111..087acdc 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:** 23.0.4~ynh1 +**Shipped version:** 23.0.6~ynh1 **Demo:** https://demo.nextcloud.com/ diff --git a/README_fr.md b/README_fr.md index 13787ed..f522dc0 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,7 +17,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 :** 23.0.4~ynh1 +**Version incluse :** 23.0.6~ynh1 **Démo :** https://demo.nextcloud.com/ From 3c18b7ac77a98e98b928bb40e4dbc47dfb6110cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 18 Jul 2022 16:06:03 +0200 Subject: [PATCH 46/52] 23.0.7 --- 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 c4f47ed..2ae46fb 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": "23.0.6~ynh1", + "version": "23.0.7~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 c25ca50..6481037 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="23.0.6" +next_version="23.0.7" # Nextcloud tarball checksum sha256 -nextcloud_source_sha256="34fbc3a6c16a623f57971b8c4df7c5e62b3650728edec7d05ec116b295040548" +nextcloud_source_sha256="89a53d3447d1dcb7ea382d18accf52223040336d08899f0b7568c6dd8a36cd50" From 469a3062bdf6b46c3e069c4fbb3339d8659dfb89 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 18 Jul 2022 14:06:09 +0000 Subject: [PATCH 47/52] 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 087acdc..30bcbaf 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:** 23.0.6~ynh1 +**Shipped version:** 23.0.7~ynh1 **Demo:** https://demo.nextcloud.com/ diff --git a/README_fr.md b/README_fr.md index f522dc0..3463d56 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,7 +17,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 :** 23.0.6~ynh1 +**Version incluse :** 23.0.7~ynh1 **Démo :** https://demo.nextcloud.com/ From a738bf1efd9fc05ac5ac215c7226cda624ac57c5 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Mon, 8 Aug 2022 10:34:47 +0200 Subject: [PATCH 48/52] =?UTF-8?q?[autopatch]=20Add=20Common=20Platform?= =?UTF-8?q?=C2=A0Enumeration=20id=20to=20`manifest.json`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/manifest.json b/manifest.json index 3650de4..08c3cce 100644 --- a/manifest.json +++ b/manifest.json @@ -14,7 +14,8 @@ "demo": "https://demo.nextcloud.com/", "admindoc": "https://docs.nextcloud.com/server/stable/admin_manual/", "userdoc": "https://docs.nextcloud.com/server/latest/user_manual/en/", - "code": "https://github.com/nextcloud/server" + "code": "https://github.com/nextcloud/server", + "cpe": "cpe:2.3:a:nextcloud:nextcloud" }, "license": "AGPL-3.0", "maintainer": { @@ -31,7 +32,7 @@ "mysql" ], "arguments": { - "install" : [ + "install": [ { "name": "domain", "type": "domain" @@ -66,4 +67,4 @@ } ] } -} +} \ No newline at end of file From 63b77ed61774ffddbacc879ef366b8b918412745 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 8 Aug 2022 09:10:36 +0000 Subject: [PATCH 49/52] Auto-update README --- README.md | 1 + README_fr.md | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 30bcbaf..c369564 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,7 @@ Online storage, file sharing platform and various other applications **Shipped version:** 23.0.7~ynh1 + **Demo:** https://demo.nextcloud.com/ ## Screenshots diff --git a/README_fr.md b/README_fr.md index 3463d56..2d7d580 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,7 +17,8 @@ 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 :** 23.0.7~ynh1 +**Version incluse :** 23.0.7~ynh1 + **Démo :** https://demo.nextcloud.com/ From 6146f4a6db666a168daa0569af60fcb44e7a93ed Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 12 Aug 2022 09:21:18 +0200 Subject: [PATCH 50/52] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index c68f9e8..c995c7a 100644 --- a/manifest.json +++ b/manifest.json @@ -23,7 +23,7 @@ "email": "pierre@kayou.io" }, "requirements": { - "yunohost": ">= 11.0.4" + "yunohost": ">= 11.0.9" }, "multi_instance": true, "services": [ From 5b8aa37707b5dcf73686334195b88863c18d4943 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 18 Aug 2022 21:26:31 +0200 Subject: [PATCH 51/52] 23.0.8 --- 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 c995c7a..3f71cff 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": "23.0.7~ynh1", + "version": "23.0.8~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 6481037..3cee76f 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="23.0.7" +next_version="23.0.8" # Nextcloud tarball checksum sha256 -nextcloud_source_sha256="89a53d3447d1dcb7ea382d18accf52223040336d08899f0b7568c6dd8a36cd50" +nextcloud_source_sha256="ac3d042253399be25a2aa01c799dec75a1459b6ae453874414f6528cc2ee5061" From a5343a5d8608134a3c15ec855b92bbc934d52b4c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 18 Aug 2022 19:26:37 +0000 Subject: [PATCH 52/52] 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 c369564..2f75031 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:** 23.0.7~ynh1 +**Shipped version:** 23.0.8~ynh1 **Demo:** https://demo.nextcloud.com/ diff --git a/README_fr.md b/README_fr.md index 2d7d580..ee21f2b 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,7 +17,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 :** 23.0.7~ynh1 +**Version incluse :** 23.0.8~ynh1 **Démo :** https://demo.nextcloud.com/