From a90582bb9313819833d30298d8460dc756a7d270 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 30 Nov 2021 23:45:52 +0100 Subject: [PATCH 01/12] 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/12] 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/12] 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/12] 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/12] 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/12] 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/12] 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/12] 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/12] 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/12] 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/12] 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/12] 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&