From 533752ad6dfe107047930b73452cb22e404368f1 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 2 May 2022 18:45:56 +0200 Subject: [PATCH 01/55] Upgrade to 24.0.0 --- check_process | 4 ++++ manifest.json | 2 +- scripts/upgrade.d/upgrade.23.sh | 7 +++++++ scripts/upgrade.d/upgrade.last.sh | 4 ++-- 4 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 scripts/upgrade.d/upgrade.23.sh diff --git a/check_process b/check_process index eef530d..131cef9 100644 --- a/check_process +++ b/check_process @@ -17,6 +17,8 @@ upgrade=1 from_commit=e249cced99423d8e6743312361f140c1fbdc3a1d #22.2.3 upgrade=1 from_commit=892f02888f31b6a0da850a5f8b2e66a151f84750 + #22.2.7 + upgrade=1 from_commit=91edc90f626d3cbd587d04a01aa91f4ab7e65b29 backup_restore=1 multi_instance=1 change_url=1 @@ -28,4 +30,6 @@ Notification=none name=Merge pull request #446 from YunoHost-Apps/22.2.0 ; commit=892f02888f31b6a0da850a5f8b2e66a151f84750 name=Merge pull request #457 from YunoHost-Apps/testing + ; commit=91edc90f626d3cbd587d04a01aa91f4ab7e65b29 + name=Merge pull request #483 from YunoHost-Apps/22.2.7 manifest_arg=domain=DOMAIN&path=PATH&admin=USER&user_home=1& diff --git a/manifest.json b/manifest.json index 5587e75..9697b6b 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": "24.0.0~ynh1", "url": "https://nextcloud.com", "upstream": { "license": "AGPL-3.0", diff --git a/scripts/upgrade.d/upgrade.23.sh b/scripts/upgrade.d/upgrade.23.sh new file mode 100644 index 0000000..7c99ebe --- /dev/null +++ b/scripts/upgrade.d/upgrade.23.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +# Last available Nextcloud version +next_version="24.0.0" + +# Nextcloud tarball checksum sha256 +nextcloud_source_sha256="" diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 69d8a8c..7c99ebe 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="24.0.0" # Nextcloud tarball checksum sha256 -nextcloud_source_sha256="67191c2b8b41591ae42accfb32216313fde0e107201682cb39029f890712bc6a" +nextcloud_source_sha256="" From 98243b2cfc6c4234b6b249337a3a75b91be751de Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 2 May 2022 16:46:01 +0000 Subject: [PATCH 02/55] 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 4e4ab68..26b6e79 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:** 24.0.0~ynh1 **Demo:** https://demo.nextcloud.com/ diff --git a/README_fr.md b/README_fr.md index f138534..a0948a1 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.4~ynh1 +**Version incluse :** 24.0.0~ynh1 **Démo :** https://demo.nextcloud.com/ From bd3ed059f0c6d26097a40ce5b2d9134bb888a9e7 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 3 May 2022 12:40:59 +0200 Subject: [PATCH 03/55] 24.0.0 --- scripts/upgrade.d/upgrade.23.sh | 2 +- scripts/upgrade.d/upgrade.last.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade.d/upgrade.23.sh b/scripts/upgrade.d/upgrade.23.sh index 7c99ebe..eb2b944 100644 --- a/scripts/upgrade.d/upgrade.23.sh +++ b/scripts/upgrade.d/upgrade.23.sh @@ -4,4 +4,4 @@ next_version="24.0.0" # Nextcloud tarball checksum sha256 -nextcloud_source_sha256="" +nextcloud_source_sha256="176cb5620f20465fb4759bdf3caaebeb7acff39d6c8630351af9f8738c173780" diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 7c99ebe..eb2b944 100755 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -4,4 +4,4 @@ next_version="24.0.0" # Nextcloud tarball checksum sha256 -nextcloud_source_sha256="" +nextcloud_source_sha256="176cb5620f20465fb4759bdf3caaebeb7acff39d6c8630351af9f8738c173780" From 5bea9c5aa72a20a99e1c5b7fd436d7e739ad0b8f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 3 May 2022 12:41:37 +0200 Subject: [PATCH 04/55] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 9697b6b..abc0317 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 6897c2895708888e7b530b50766c4e7b2bbd69b9 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 3 May 2022 13:00:50 +0200 Subject: [PATCH 05/55] Update app-02-Allow-for-eval-in-JS-scripts-for-YunoHost-tile.patch --- ...-02-Allow-for-eval-in-JS-scripts-for-YunoHost-tile.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sources/patches_last_version/app-02-Allow-for-eval-in-JS-scripts-for-YunoHost-tile.patch b/sources/patches_last_version/app-02-Allow-for-eval-in-JS-scripts-for-YunoHost-tile.patch index 38f37f9..43159c3 100644 --- a/sources/patches_last_version/app-02-Allow-for-eval-in-JS-scripts-for-YunoHost-tile.patch +++ b/sources/patches_last_version/app-02-Allow-for-eval-in-JS-scripts-for-YunoHost-tile.patch @@ -12,6 +12,6 @@ index e9ecf00036..8e69c8d2dc 100644 - protected $evalScriptAllowed = false; + // YunoHost patch: allow for eval in JS scripts for YunoHost tile + protected $evalScriptAllowed = true; - /** @var array Domains from which scripts can get loaded */ - protected $allowedScriptDomains = [ - '\'self\'', + /** @var bool Whether strict-dynamic should be set */ + protected $strictDynamicAllowed = null; + /** @var array Domains from which scripts can get loaded */ From 380274e7ae0ac4651a2384b10f3c400ed67a8196 Mon Sep 17 00:00:00 2001 From: Nicolas Frandeboeuf Date: Mon, 9 May 2022 06:56:08 +0000 Subject: [PATCH 06/55] 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 57715dbcd5ff579c18ebec151adfd58dffd8585a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 19 May 2022 15:03:43 +0200 Subject: [PATCH 07/55] 24.0.1 --- 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 abc0317..77974ab 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": "24.0.0~ynh1", + "version": "24.0.1~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 eb2b944..1f32cca 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="24.0.0" +next_version="24.0.1" # Nextcloud tarball checksum sha256 -nextcloud_source_sha256="176cb5620f20465fb4759bdf3caaebeb7acff39d6c8630351af9f8738c173780" +nextcloud_source_sha256="d32a8f6c4722a45cb67de7018163cfafcfa22a871fbac0f623c3875fa4304e5a" From f2d04d0a816bc7762e28805faa2cff3ea38e7772 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 19 May 2022 13:03:49 +0000 Subject: [PATCH 08/55] 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 26b6e79..727022a 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:** 24.0.0~ynh1 +**Shipped version:** 24.0.1~ynh1 **Demo:** https://demo.nextcloud.com/ diff --git a/README_fr.md b/README_fr.md index a0948a1..cea39a4 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 :** 24.0.0~ynh1 +**Version incluse :** 24.0.1~ynh1 **Démo :** https://demo.nextcloud.com/ From d54d0c8a815158765543b54b43b91592dc0f93c5 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 20 May 2022 09:03:30 +0200 Subject: [PATCH 09/55] 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 250f8b5..ded3f70 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}-fpm 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 f25395bcc05ae2d73e4396a19f73f07504e961cf Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 21 May 2022 00:05:31 +0200 Subject: [PATCH 10/55] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 77974ab..92d300d 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 3b59475f71a56b715f09cefbb8463d5f238ba833 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 14 Jun 2022 14:59:47 +0200 Subject: [PATCH 11/55] Add db_user var --- scripts/install | 7 ++++--- scripts/remove | 3 ++- scripts/restore | 5 +++-- scripts/upgrade | 1 + 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/scripts/install b/scripts/install index c3a1d2e..a6ec82e 100755 --- a/scripts/install +++ b/scripts/install @@ -65,8 +65,9 @@ ynh_install_app_dependencies $pkg_dependencies ynh_script_progression --message="Creating a MySQL database..." --weight=2 db_name=$(ynh_sanitize_dbid --db_name=$app) +db_user=$db_name ynh_app_setting_set --app=$app --key=db_name --value=$db_name -ynh_mysql_setup_db --db_user=$db_name --db_name=$db_name +ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -160,7 +161,7 @@ admin_password="$(ynh_string_random --length=6)" # Install Nextcloud using a temporary admin user exec_occ maintenance:install \ --database "mysql" --database-name $db_name \ - --database-user $db_name --database-pass "$db_pwd" \ + --database-user $db_user --database-pass "$db_pwd" \ --admin-user "admin" --admin-pass "$admin_password" \ --data-dir "$datadir" \ || ynh_die --message="Unable to install Nextcloud" @@ -255,7 +256,7 @@ exec_occ config:system:set overwrite.cli.url --value="https://${domain}" #================================================= # Set the user as admin -ynh_mysql_connect_as --user=$db_name --password="$db_pwd" --database=$db_name \ +ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name \ <<< "INSERT INTO oc_group_user VALUES ('admin','$admin');" # And delete admin user exec_occ user:delete admin diff --git a/scripts/remove b/scripts/remove index 024ed93..36db879 100755 --- a/scripts/remove +++ b/scripts/remove @@ -18,6 +18,7 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) db_name=$(ynh_app_setting_get --app=$app --key=db_name) +db_user=$db_name final_path=$(ynh_app_setting_get --app=$app --key=final_path) datadir=$(ynh_app_setting_get --app=$app --key=datadir) @@ -37,7 +38,7 @@ ynh_remove_app_dependencies ynh_script_progression --message="Removing the MySQL database..." --weight=5 # Remove a database if it exists, along with the associated user -ynh_mysql_remove_db --db_user=$db_name --db_name=$db_name +ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name #================================================= # REMOVE APP MAIN DIR diff --git a/scripts/restore b/scripts/restore index 425e580..874a35f 100755 --- a/scripts/restore +++ b/scripts/restore @@ -27,6 +27,7 @@ domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) +db_user=$db_name phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) datadir=$(ynh_app_setting_get --app=$app --key=datadir) @@ -71,8 +72,8 @@ ynh_restore_file --origin_path="$final_path" ynh_script_progression --message="Restoring the MySQL database..." --weight=9 db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) -ynh_mysql_setup_db --db_user=$db_name --db_name=$db_name --db_pwd=$db_pwd -ynh_mysql_connect_as --user=$db_name --password=$db_pwd --database=$db_name < ./db.sql +ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd +ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql #================================================= # RECREATE THE DEDICATED USER diff --git a/scripts/upgrade b/scripts/upgrade index c2a731a..c087261 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -21,6 +21,7 @@ path_url=$(ynh_app_setting_get --app=$app --key=path) 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) +db_user=$db_name user_home=$(ynh_app_setting_get --app=$app --key=user_home) fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint) From 42c7fc9b89c4bda07d5df8283feb7edc290bdfa7 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 14 Jun 2022 12:59:53 +0000 Subject: [PATCH 12/55] 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 727022a..3882c6a 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 cea39a4..3ea7de1 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 d4314140381712e3aab77c2114176d48272bdc61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 20 Jun 2022 22:46:45 +0200 Subject: [PATCH 13/55] 24.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 92d300d..7157d67 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": "24.0.1~ynh1", + "version": "24.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 1f32cca..6d588eb 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="24.0.1" +next_version="24.0.2" # Nextcloud tarball checksum sha256 -nextcloud_source_sha256="d32a8f6c4722a45cb67de7018163cfafcfa22a871fbac0f623c3875fa4304e5a" +nextcloud_source_sha256="30d6cac1265dff221836bec46a937dcafd7e7d52ee59b939841750b514e5033d" From 64846ba1447a75c55b5d1c5971b8530dc1ca9d70 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 20 Jun 2022 22:10:00 +0000 Subject: [PATCH 14/55] 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 3882c6a..8e4be07 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:** 24.0.1~ynh1 +**Shipped version:** 24.0.2~ynh1 **Demo:** https://demo.nextcloud.com/ diff --git a/README_fr.md b/README_fr.md index 3ea7de1..3dee36f 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 :** 24.0.1~ynh1 +**Version incluse :** 24.0.2~ynh1 **Démo :** https://demo.nextcloud.com/ From 83d4b3dfdb742f5032131059ccc9a7a1cd851403 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 1 Jul 2022 13:12:51 +0000 Subject: [PATCH 15/55] 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 16/55] 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 17/55] 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 45c52e7f13f33b9ffaf6522285f71a63fc9dfb0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 16 Jul 2022 12:25:35 +0200 Subject: [PATCH 18/55] Update check_process --- check_process | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/check_process b/check_process index 131cef9..0776e9c 100644 --- a/check_process +++ b/check_process @@ -13,12 +13,8 @@ setup_private=1 setup_public=1 upgrade=1 - #21.0.2 - upgrade=1 from_commit=e249cced99423d8e6743312361f140c1fbdc3a1d - #22.2.3 - upgrade=1 from_commit=892f02888f31b6a0da850a5f8b2e66a151f84750 - #22.2.7 - upgrade=1 from_commit=91edc90f626d3cbd587d04a01aa91f4ab7e65b29 + #22.2.9 + upgrade=1 from_commit=f565b6d216f5340f752e6d6a21a14abc3811e0e7 backup_restore=1 multi_instance=1 change_url=1 @@ -26,10 +22,6 @@ Email= Notification=none ;;; Upgrade options - ; commit=e249cced99423d8e6743312361f140c1fbdc3a1d - name=Merge pull request #446 from YunoHost-Apps/22.2.0 - ; commit=892f02888f31b6a0da850a5f8b2e66a151f84750 - name=Merge pull request #457 from YunoHost-Apps/testing - ; commit=91edc90f626d3cbd587d04a01aa91f4ab7e65b29 - name=Merge pull request #483 from YunoHost-Apps/22.2.7 + ; commit=f565b6d216f5340f752e6d6a21a14abc3811e0e7 + name=Merge pull request #495 from YunoHost-Apps/22.2.9 manifest_arg=domain=DOMAIN&path=PATH&admin=USER&user_home=1& From 69b56e2426c81874801d721aa16328f5fecaec89 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:01:24 +0200 Subject: [PATCH 19/55] 24.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 7157d67..83ab102 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": "24.0.2~ynh1", + "version": "24.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 6d588eb..4734075 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="24.0.2" +next_version="24.0.3" # Nextcloud tarball checksum sha256 -nextcloud_source_sha256="30d6cac1265dff221836bec46a937dcafd7e7d52ee59b939841750b514e5033d" +nextcloud_source_sha256="320c81f9b902922b4bcef3eacf858596a14347fd45bddd26dac198562d212439" From 543dd524cce038f6dcdfac247a273ef3bdab303d Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 18 Jul 2022 14:01:30 +0000 Subject: [PATCH 20/55] 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 8e4be07..5985477 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:** 24.0.2~ynh1 +**Shipped version:** 24.0.3~ynh1 **Demo:** https://demo.nextcloud.com/ diff --git a/README_fr.md b/README_fr.md index 3dee36f..9ee016b 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 :** 24.0.2~ynh1 +**Version incluse :** 24.0.3~ynh1 **Démo :** https://demo.nextcloud.com/ From 74761b3ee43844da66588e312da9e2f77aa3ffaa 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:03:55 +0200 Subject: [PATCH 21/55] 22.2.10 --- 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 9229804..3650de4 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.9~ynh1", + "version": "22.2.10~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 3382934..035da35 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.9" +next_version="22.2.10" # Nextcloud tarball checksum sha256 -nextcloud_source_sha256="0beb6b959db855e30023954bd1299b6bb1331f895e3095b51350ab5eaeb5b1cd" +nextcloud_source_sha256="8de167bfcfcaa661245a00a5ac36628e7961951b9fe2dfaf4f8a5aac6907ccdb" From da2019d9ea2e588cdbe5c9333cfdb322b3535698 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 18 Jul 2022 14:04:00 +0000 Subject: [PATCH 22/55] 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 5c343a8..85d4a7d 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.9~ynh1 +**Shipped version:** 22.2.10~ynh1 **Demo:** https://demo.nextcloud.com/ diff --git a/README_fr.md b/README_fr.md index f5f3104..be444b6 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 :** 22.2.9~ynh1 +**Version incluse :** 22.2.10~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 23/55] 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 24/55] 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 890941eaa9e8d9a53ee4681a406634985849d95e Mon Sep 17 00:00:00 2001 From: tituspijean Date: Thu, 4 Aug 2022 16:19:06 +0200 Subject: [PATCH 25/55] Implement Config Panels v1.0 (PHP and maintenance mode) --- config_panel.toml | 25 +++++--- scripts/config | 150 +++++++++++++++++++++++++++------------------- scripts/install | 13 +++- scripts/upgrade | 13 ++++ 4 files changed, 132 insertions(+), 69 deletions(-) diff --git a/config_panel.toml b/config_panel.toml index 9c73626..76d46f5 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -1,26 +1,37 @@ -version = "0.1" -name = "Nextcloud configuration panel" +version = "1.0" [main] name = "Nextcloud configuration" + [main.maintenance_mode] + name = "Maintenance mode" + + [main.maintenance_mode.maintenance_mode] + ask = "Enable Nextcloud's maintenance mode?" + type = "boolean" + default = "0" + [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"] + type = "select" + choices.low = "Low, <= 20Mb per pool" + choices.medium = "Medium, between 20Mb and 40Mb per pool" + choices.high = "High, > 40Mb per pool" + choices.specific = "Use specific value from the next option" default = "low" - help = "low <= 20Mb per pool. medium between 20Mb and 40Mb per pool. high > 40Mb per pool.
Use specific to set a value with the following option." - [main.php_fpm_config.free_footprint] + [main.php_fpm_config.fpm_free_footprint] ask = "Memory footprint of the service?" type = "number" 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?" + type = "select" 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." diff --git a/scripts/config b/scripts/config index 0c14bca..7890d28 100644 --- a/scripts/config +++ b/scripts/config @@ -9,90 +9,118 @@ 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__maintenance_mode() { + # Maintenance mode status + maintenance_mode_status="$(cd "$final_path" && ynh_exec_as "$app" \ + php${phpversion} --define apc.enable_cli=1 occ --no-interaction --no-ansi maintenance:mode)" 2> /dev/null + if echo $maintenance_mode_status | grep -q "disabled" + then + echo "0" + elif echo $maintenance_mode_status | grep -q "enabled" + then + echo "1" + else + ynh_print_err --message="Unexpected output from maintenance status check command." + exit 0 + 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}" +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 +} -# 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() { +set__maintenance_mode() { + if [ "$maintenance_mode" -eq "0" ]; then + # If maintenance_mode was set to 0, disable maintenance mode + (cd "$final_path" && ynh_exec_as "$app" \ + php${phpversion} --define apc.enable_cli=1 occ --no-interaction --no-ansi maintenance:mode --off) + ynh_print_info "Maintenance mode disabled" + elif [ "$maintenance_mode" -eq "1" ]; then + # If maintenance_mode was set to 1, enable maintenance mode + (cd "$final_path" && ynh_exec_as "$app" \ + php${phpversion} --define apc.enable_cli=1 occ --no-interaction --no-ansi maintenance:mode --on) + ynh_print_info "Maintenance mode enabled" + fi + ynh_app_setting_set --app=$app --key=maintenance_mode --value="$maintenance_mode" +} - #================================================= - # 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__fpm_free_footprint() { + if [ "$fpm_footprint" = "specific" ] + then + ynh_app_setting_set --app=$app --key=fpm_footprint --value="$fpm_free_footprint" fi } #================================================= # GENERIC FINALIZATION #================================================= -# SELECT THE ACTION FOLLOWING THE GIVEN ARGUMENT -#================================================= -case $1 in - show) show_config;; - apply) apply_config;; -esac +ynh_app_config_validate() { + _ynh_app_config_validate + + if [ "${changed[fpm_usage]}" == "true" ] || [ "${changed[fpm_footprint]}" == "true" ] || [ "${changed[fpm_free_footprint]}" == "true" ]; then + # If fpm_footprint is set to 'specific', use $fpm_free_footprint value. + if [ "$fpm_footprint" = "specific" ] + then + fpm_footprint=$fpm_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 diff --git a/scripts/install b/scripts/install index 3ed8f22..b1dbca1 100755 --- a/scripts/install +++ b/scripts/install @@ -49,6 +49,9 @@ 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 +maintenance_mode=0 +ynh_app_setting_set --app=$app --key=maintenance_mode --value=$maintenance_mode + #================================================= # STANDARD MODIFICATIONS #================================================= @@ -103,8 +106,16 @@ ynh_system_user_create --username=$app #================================================= ynh_script_progression --message="Configuring PHP-FPM..." --weight=50 +fpm_footprint="high" +fpm_free_footprint=0 +fpm_usage="medium" + +ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint +ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint +ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage + # Create a dedicated php-fpm config -ynh_add_fpm_config --usage=medium --footprint=high --phpversion=$YNH_PHP_VERSION +ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint --phpversion=$YNH_PHP_VERSION # Used by ynh_add_nginx_config phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) diff --git a/scripts/upgrade b/scripts/upgrade index f4b2bae..ca23604 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -24,6 +24,7 @@ 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) +maintenance_mode=$(ynh_app_setting_get --app=$app --key=maintenance_mode) fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint) fpm_usage=$(ynh_app_setting_get --app=$app --key=fpm_usage) @@ -59,12 +60,24 @@ fi # Remove the option backup_core_only if it's in the settings.yml file ynh_app_setting_delete --app=$app --key=backup_core_only +# If maintenance_mode doesn't exist, create it +if [ -z "$maintenance_mode" ]; then + maintenance_mode=0 + ynh_app_setting_set --app=$app --key=maintenance_mode --value=$maintenance_mode +fi + # If fpm_footprint doesn't exist, create it if [ -z "$fpm_footprint" ]; then fpm_footprint=high ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint fi +# If fpm_free_footprint doesn't exist, create it +if [ -z "$fpm_free_footprint" ]; then + fpm_free_footprint=0 + ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint +fi + # If fpm_usage doesn't exist, create it if [ -z "$fpm_usage" ]; then fpm_usage=medium From 2fefecbe546f96198d6068a1c2d6f872d9a77e82 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Thu, 4 Aug 2022 16:31:49 +0200 Subject: [PATCH 26/55] Indentation in scripts/config --- scripts/config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/config b/scripts/config index 7890d28..7b6b67e 100644 --- a/scripts/config +++ b/scripts/config @@ -25,7 +25,7 @@ current_fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint) get__maintenance_mode() { # Maintenance mode status maintenance_mode_status="$(cd "$final_path" && ynh_exec_as "$app" \ - php${phpversion} --define apc.enable_cli=1 occ --no-interaction --no-ansi maintenance:mode)" 2> /dev/null + php${phpversion} --define apc.enable_cli=1 occ --no-interaction --no-ansi maintenance:mode)" 2> /dev/null if echo $maintenance_mode_status | grep -q "disabled" then echo "0" @@ -70,12 +70,12 @@ set__maintenance_mode() { # If maintenance_mode was set to 0, disable maintenance mode (cd "$final_path" && ynh_exec_as "$app" \ php${phpversion} --define apc.enable_cli=1 occ --no-interaction --no-ansi maintenance:mode --off) - ynh_print_info "Maintenance mode disabled" + ynh_print_info "Maintenance mode disabled" elif [ "$maintenance_mode" -eq "1" ]; then # If maintenance_mode was set to 1, enable maintenance mode (cd "$final_path" && ynh_exec_as "$app" \ php${phpversion} --define apc.enable_cli=1 occ --no-interaction --no-ansi maintenance:mode --on) - ynh_print_info "Maintenance mode enabled" + ynh_print_info "Maintenance mode enabled" fi ynh_app_setting_set --app=$app --key=maintenance_mode --value="$maintenance_mode" } From 085c57f29df60582d3698162fa02bb08445d8941 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sun, 7 Aug 2022 17:42:37 +0200 Subject: [PATCH 27/55] Make fpm_free_footprint dynamically visible --- config_panel.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config_panel.toml b/config_panel.toml index 76d46f5..99a3aef 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -20,10 +20,11 @@ name = "Nextcloud configuration" choices.low = "Low, <= 20Mb per pool" choices.medium = "Medium, between 20Mb and 40Mb per pool" choices.high = "High, > 40Mb per pool" - choices.specific = "Use specific value from the next option" + choices.specific = "Use specific value" default = "low" [main.php_fpm_config.fpm_free_footprint] + visible = "fpm_footprint == 'specific'" ask = "Memory footprint of the service?" type = "number" default = "0" From a738bf1efd9fc05ac5ac215c7226cda624ac57c5 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Mon, 8 Aug 2022 10:34:47 +0200 Subject: [PATCH 28/55] =?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 29/55] 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 b47257a450e96a427ab752dd8a5019565efafbb7 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Mon, 8 Aug 2022 23:04:04 +0200 Subject: [PATCH 30/55] Update config_panel.toml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> --- config_panel.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config_panel.toml b/config_panel.toml index 99a3aef..be4a603 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -7,7 +7,7 @@ name = "Nextcloud configuration" name = "Maintenance mode" [main.maintenance_mode.maintenance_mode] - ask = "Enable Nextcloud's maintenance mode?" + ask = "Enable maintenance mode" type = "boolean" default = "0" From 7ab5446b21d44c54ae9d81f081f39a751c88f2dc Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 8 Aug 2022 21:04:07 +0000 Subject: [PATCH 31/55] 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 85d4a7d..3e64c64 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,7 @@ Online storage, file sharing platform and various other applications **Shipped version:** 22.2.10~ynh1 + **Demo:** https://demo.nextcloud.com/ ## Screenshots diff --git a/README_fr.md b/README_fr.md index be444b6..eaf70a9 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 :** 22.2.10~ynh1 +**Version incluse :** 22.2.10~ynh1 + **Démo :** https://demo.nextcloud.com/ From 5d225918eaacb772bb8f671176433f3b92ca7e8a Mon Sep 17 00:00:00 2001 From: tituspijean Date: Mon, 8 Aug 2022 23:05:58 +0200 Subject: [PATCH 32/55] Apply suggestions from code review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> --- config_panel.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config_panel.toml b/config_panel.toml index be4a603..af1a24c 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -15,7 +15,7 @@ name = "Nextcloud configuration" name = "PHP-FPM configuration" [main.php_fpm_config.fpm_footprint] - ask = "Memory footprint of the service?" + ask = "Memory footprint" type = "select" choices.low = "Low, <= 20Mb per pool" choices.medium = "Medium, between 20Mb and 40Mb per pool" @@ -31,7 +31,7 @@ name = "Nextcloud configuration" 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.fpm_usage] - ask = "Expected usage of the service?" + ask = "Expected usage" type = "select" choices = ["low", "medium", "high"] default = "low" From 6146f4a6db666a168daa0569af60fcb44e7a93ed Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 12 Aug 2022 09:21:18 +0200 Subject: [PATCH 33/55] 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 b5f9f7cf06713ded449bed5d4ec39e4f8ae9eb38 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 12 Aug 2022 09:21:38 +0200 Subject: [PATCH 34/55] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 83ab102..fa221ce 100644 --- a/manifest.json +++ b/manifest.json @@ -22,7 +22,7 @@ "email": "pierre@kayou.io" }, "requirements": { - "yunohost": ">= 11.0.4" + "yunohost": ">= 11.0.9" }, "multi_instance": true, "services": [ From 4eca26135c03ebe5d40103d194fbb27150912bf2 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 12 Aug 2022 07:21:43 +0000 Subject: [PATCH 35/55] 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 5985477..cbb5510 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,7 @@ Online storage, file sharing platform and various other applications **Shipped version:** 24.0.3~ynh1 + **Demo:** https://demo.nextcloud.com/ ## Screenshots diff --git a/README_fr.md b/README_fr.md index 9ee016b..518d309 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 :** 24.0.3~ynh1 +**Version incluse :** 24.0.3~ynh1 + **Démo :** https://demo.nextcloud.com/ From e04bdecbfcb7e962306128b304050b56412d61df Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 12 Aug 2022 21:48:19 +0000 Subject: [PATCH 36/55] Auto-update README --- README.md | 1 + README_fr.md | 1 + 2 files changed, 2 insertions(+) diff --git a/README.md b/README.md index 5985477..cbb5510 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,7 @@ Online storage, file sharing platform and various other applications **Shipped version:** 24.0.3~ynh1 + **Demo:** https://demo.nextcloud.com/ ## Screenshots diff --git a/README_fr.md b/README_fr.md index d0ef79c..518d309 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,6 +19,7 @@ Stockage en ligne, plateforme de partage de fichiers et diverses autres applicat **Version incluse :** 24.0.3~ynh1 + **Démo :** https://demo.nextcloud.com/ ## Captures d'écran From fdfc322198cada12a125a4b99fe109169c8a805b 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:23:52 +0200 Subject: [PATCH 37/55] 24.0.4 --- manifest.json | 4 ++-- scripts/upgrade.d/upgrade.last.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifest.json b/manifest.json index 83ab102..b1f4a14 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": "24.0.3~ynh1", + "version": "24.0.4~ynh1", "url": "https://nextcloud.com", "upstream": { "license": "AGPL-3.0", @@ -22,7 +22,7 @@ "email": "pierre@kayou.io" }, "requirements": { - "yunohost": ">= 11.0.4" + "yunohost": ">= 11.0.9" }, "multi_instance": true, "services": [ diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 4734075..1bbff1f 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="24.0.3" +next_version="24.0.4" # Nextcloud tarball checksum sha256 -nextcloud_source_sha256="320c81f9b902922b4bcef3eacf858596a14347fd45bddd26dac198562d212439" +nextcloud_source_sha256="d107426f8e1c193db882a04c844f9bc7e7eeb7c21e46c46197e5154d6d6ac28e" From 04fb7a5084b388e86303187c1cdb6643492eb793 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 18 Aug 2022 19:24:09 +0000 Subject: [PATCH 38/55] 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 cbb5510..514886b 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:** 24.0.3~ynh1 +**Shipped version:** 24.0.4~ynh1 **Demo:** https://demo.nextcloud.com/ diff --git a/README_fr.md b/README_fr.md index 518d309..8f70f7a 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 :** 24.0.3~ynh1 +**Version incluse :** 24.0.4~ynh1 **Démo :** https://demo.nextcloud.com/ 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 39/55] 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 40/55] 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/ From 65dcd8b278c7a716d858b829680f9ed8052bf975 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 25 Aug 2022 13:16:56 +0000 Subject: [PATCH 41/55] Auto-update README --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index d55502f..2f75031 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,6 @@ Online storage, file sharing platform and various other applications **Shipped version:** 23.0.8~ynh1 - **Demo:** https://demo.nextcloud.com/ ## Screenshots From f73f38a0c5dd5024b48e75f516e167c19e122351 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 7 Sep 2022 08:00:41 +0200 Subject: [PATCH 42/55] reorder script --- scripts/restore | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/scripts/restore b/scripts/restore index 874a35f..d0f690d 100755 --- a/scripts/restore +++ b/scripts/restore @@ -44,21 +44,6 @@ test ! -d $final_path \ #================================================= # STANDARD RESTORATION STEPS -#================================================= -# RESTORE THE NGINX CONFIGURATION -#================================================= - -ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" - -# Check if .well-known is available for this domain -if is_url_handled --domain="$domain" --path="/.well-known/caldav" || is_url_handled --domain="$domain" --path="/.well-known/carddav" -then - ynh_print_warn --message="Another app already uses the domain $domain to serve a caldav/carddav feature. You may encounter issues when dealing with your calendar or address book." - - # Remove lines about .well-known/carddav and caldav with sed. - sed --in-place --regexp-extended '/location = \/\.well\-known\/(caldav|carddav)/d' "/etc/nginx/conf.d/$domain.d/$app.conf" -fi - #================================================= # RESTORE THE APP MAIN DIR #================================================= @@ -104,15 +89,32 @@ ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" # Recreate a dedicated php-fpm config ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint --phpversion=$phpversion +#================================================= +# RESTORE THE NGINX CONFIGURATION +#================================================= + +ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" + +# Check if .well-known is available for this domain +if is_url_handled --domain="$domain" --path="/.well-known/caldav" || is_url_handled --domain="$domain" --path="/.well-known/carddav" +then + ynh_print_warn --message="Another app already uses the domain $domain to serve a caldav/carddav feature. You may encounter issues when dealing with your calendar or address book." + + # Remove lines about .well-known/carddav and caldav with sed. + sed --in-place --regexp-extended '/location = \/\.well\-known\/(caldav|carddav)/d' "/etc/nginx/conf.d/$domain.d/$app.conf" +fi + #================================================= # RESTORE THE CRON FILE #================================================= +ynh_script_progression --message="Restoring cron job..." --weight=1 ynh_restore_file --origin_path="/etc/cron.d/$app" #================================================= # BACKUP THE LOGROTATE CONFIGURATION #================================================= +ynh_script_progression --message="Restoring the logrotate configuration..." --weight=1 ynh_restore_file --origin_path="/etc/logrotate.d/$app" From 8c37940dbacfcef6386d634aa887aaca4e5994d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 8 Sep 2022 21:40:43 +0200 Subject: [PATCH 43/55] 24.0.5 --- 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 aaac05e..b9f7e4b 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": "24.0.4~ynh1", + "version": "24.0.5~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 1bbff1f..312eff2 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="24.0.4" +next_version="24.0.5" # Nextcloud tarball checksum sha256 -nextcloud_source_sha256="d107426f8e1c193db882a04c844f9bc7e7eeb7c21e46c46197e5154d6d6ac28e" +nextcloud_source_sha256="b22788377ccb9391e7f9eced3f69a9236669aeaab2e0ea5250a73edf5f1ef026" From 54652ce08505f93466a69a31286a1c8b0e9cd994 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 8 Sep 2022 19:40:50 +0000 Subject: [PATCH 44/55] 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 514886b..4b05093 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:** 24.0.4~ynh1 +**Shipped version:** 24.0.5~ynh1 **Demo:** https://demo.nextcloud.com/ diff --git a/README_fr.md b/README_fr.md index 8f70f7a..f6e9e7d 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 :** 24.0.4~ynh1 +**Version incluse :** 24.0.5~ynh1 **Démo :** https://demo.nextcloud.com/ From a96fa3486ae395b20b27f0ffaf216cba76612dc6 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 6 Oct 2022 13:14:59 +0200 Subject: [PATCH 45/55] 24.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 b9f7e4b..49f3983 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": "24.0.5~ynh1", + "version": "24.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 312eff2..7e7ee87 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="24.0.5" +next_version="24.0.6" # Nextcloud tarball checksum sha256 -nextcloud_source_sha256="b22788377ccb9391e7f9eced3f69a9236669aeaab2e0ea5250a73edf5f1ef026" +nextcloud_source_sha256="b26dff9980a47e7e722805fdbbf87e07f59a3817b03ecc32698e028e9baf0301" From 3353270f8516cca5205da4cf92b6091573b089f8 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 6 Oct 2022 20:47:56 +0000 Subject: [PATCH 46/55] 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 4b05093..137acfb 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:** 24.0.5~ynh1 +**Shipped version:** 24.0.6~ynh1 *(:warning: This is the `testing` branch. The [`master` branch](https://github.com/YunoHost-Apps/nextcloud_ynh/tree/master) used in the catalog is currently on version 24.0.5\~ynh1.)* **Demo:** https://demo.nextcloud.com/ diff --git a/README_fr.md b/README_fr.md index f6e9e7d..dc5b5eb 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 :** 24.0.5~ynh1 +**Version incluse :** 24.0.6~ynh1 *(:warning: Il s'agit de la branche `testing`. La [branche `master`](https://github.com/YunoHost-Apps/nextcloud_ynh/tree/master) utilisée dans le catalogue est actuellement en 24.0.5\~ynh1.)* **Démo :** https://demo.nextcloud.com/ From de75a8f4b0544de8ffa808e82d5f4882ead637b1 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 19 Oct 2022 12:25:51 +0200 Subject: [PATCH 47/55] 25.0.0 --- manifest.json | 2 +- scripts/upgrade.d/upgrade.24.sh | 7 +++++++ scripts/upgrade.d/upgrade.last.sh | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 scripts/upgrade.d/upgrade.24.sh diff --git a/manifest.json b/manifest.json index 49f3983..85df3df 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": "24.0.6~ynh1", + "version": "25.0.0~ynh1", "url": "https://nextcloud.com", "upstream": { "license": "AGPL-3.0", diff --git a/scripts/upgrade.d/upgrade.24.sh b/scripts/upgrade.d/upgrade.24.sh new file mode 100644 index 0000000..658c57d --- /dev/null +++ b/scripts/upgrade.d/upgrade.24.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +# Last available Nextcloud version +next_version="25.0.0" + +# Nextcloud tarball checksum sha256 +nextcloud_source_sha256="2c05ac9d7b72b44ef8b3d2ae03ff0fd6121e254b8054556f5163bd8760dd8f49" diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 7e7ee87..658c57d 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="24.0.6" +next_version="25.0.0" # Nextcloud tarball checksum sha256 -nextcloud_source_sha256="b26dff9980a47e7e722805fdbbf87e07f59a3817b03ecc32698e028e9baf0301" +nextcloud_source_sha256="2c05ac9d7b72b44ef8b3d2ae03ff0fd6121e254b8054556f5163bd8760dd8f49" From fe531f8b336fa975129317330d61952bb670c7b0 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 19 Oct 2022 10:26:03 +0000 Subject: [PATCH 48/55] Auto-update README --- README.md | 3 +-- README_fr.md | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 137acfb..10d424b 100644 --- a/README.md +++ b/README.md @@ -17,8 +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:** 24.0.6~ynh1 *(:warning: This is the `testing` branch. The [`master` branch](https://github.com/YunoHost-Apps/nextcloud_ynh/tree/master) used in the catalog is currently on version 24.0.5\~ynh1.)* - +**Shipped version:** 25.0.0~ynh1 **Demo:** https://demo.nextcloud.com/ diff --git a/README_fr.md b/README_fr.md index dc5b5eb..772331b 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,8 +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 :** 24.0.6~ynh1 *(:warning: Il s'agit de la branche `testing`. La [branche `master`](https://github.com/YunoHost-Apps/nextcloud_ynh/tree/master) utilisée dans le catalogue est actuellement en 24.0.5\~ynh1.)* - +**Version incluse :** 25.0.0~ynh1 **Démo :** https://demo.nextcloud.com/ From 31ca0b22afd215093b8be32d353828f04bd0ed38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 2 Nov 2022 10:41:48 +0100 Subject: [PATCH 49/55] 24.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 b9f7e4b..49f3983 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": "24.0.5~ynh1", + "version": "24.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 312eff2..7e7ee87 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="24.0.5" +next_version="24.0.6" # Nextcloud tarball checksum sha256 -nextcloud_source_sha256="b22788377ccb9391e7f9eced3f69a9236669aeaab2e0ea5250a73edf5f1ef026" +nextcloud_source_sha256="b26dff9980a47e7e722805fdbbf87e07f59a3817b03ecc32698e028e9baf0301" From d4a8f35ee2b1baff04e3cf64d8db05f905a08875 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 2 Nov 2022 09:41:56 +0000 Subject: [PATCH 50/55] Auto-update README --- README.md | 3 +-- README_fr.md | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 4b05093..e64269f 100644 --- a/README.md +++ b/README.md @@ -17,8 +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:** 24.0.5~ynh1 - +**Shipped version:** 24.0.6~ynh1 **Demo:** https://demo.nextcloud.com/ diff --git a/README_fr.md b/README_fr.md index f6e9e7d..52e34e7 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,8 +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 :** 24.0.5~ynh1 - +**Version incluse :** 24.0.6~ynh1 **Démo :** https://demo.nextcloud.com/ From 0d0b05a9e47d2253c2bbebd1229cd886f7ab10bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 3 Nov 2022 13:37:18 +0100 Subject: [PATCH 51/55] 24.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 49f3983..6ffd70f 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": "24.0.6~ynh1", + "version": "24.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 7e7ee87..b6cec97 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="24.0.6" +next_version="24.0.7" # Nextcloud tarball checksum sha256 -nextcloud_source_sha256="b26dff9980a47e7e722805fdbbf87e07f59a3817b03ecc32698e028e9baf0301" +nextcloud_source_sha256="a1c7344a4eb27260a9f6f6e6f586bdc4fb35e1e9330e1a6e8d46c05634db6384" From 00d78a9c8521dc536ba031f85a3dc5f7b5ff4174 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 3 Nov 2022 12:37:28 +0000 Subject: [PATCH 52/55] 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 e64269f..5a829a3 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:** 24.0.6~ynh1 +**Shipped version:** 24.0.7~ynh1 **Demo:** https://demo.nextcloud.com/ diff --git a/README_fr.md b/README_fr.md index 52e34e7..0b931b9 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 :** 24.0.6~ynh1 +**Version incluse :** 24.0.7~ynh1 **Démo :** https://demo.nextcloud.com/ From 1ea991b7dd8bba48870092420ec3fb297b1fec90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 3 Nov 2022 13:39:58 +0100 Subject: [PATCH 53/55] 25.0.1 --- 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 85df3df..799055d 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": "25.0.0~ynh1", + "version": "25.0.1~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 658c57d..4b026f4 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="25.0.0" +next_version="25.0.1" # Nextcloud tarball checksum sha256 -nextcloud_source_sha256="2c05ac9d7b72b44ef8b3d2ae03ff0fd6121e254b8054556f5163bd8760dd8f49" +nextcloud_source_sha256="72d4076924caf19139c40178597af6211799e20440ce196fb43b9c4e47d77515" From 27877aa5b36081946e0c8c114867c2e8e0a8c262 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 3 Nov 2022 21:57:10 +0100 Subject: [PATCH 54/55] Nextcloud has deprecated 32-bit --- scripts/install | 6 ++++++ scripts/upgrade | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/scripts/install b/scripts/install index e4c33e7..c61b9e8 100755 --- a/scripts/install +++ b/scripts/install @@ -40,6 +40,12 @@ test ! -e "$final_path" || ynh_die --message="This path already contains a folde # Register (book) web path ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url +# Check machine architecture (Seens 25.0 Nextcloud doesn't support 32bit machines) +if [ $YNH_ARCH == "i386" ]; +then + ynh_die --message="Sorry, Nextcloud has deprecated 32-bit support" +fi + #================================================= # STORE SETTINGS FROM MANIFEST #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index cdd42ea..cc65142 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -34,6 +34,12 @@ fpm_usage=$(ynh_app_setting_get --app=$app --key=fpm_usage) upgrade_type=$(ynh_check_app_version_changed) +# Check machine architecture (Seens 25.0 Nextcloud doesn't support 32bit machines) +if [ $YNH_ARCH == "i386" ]; +then + ynh_die --message="Sorry, Nextcloud has deprecated 32-bit support" +fi + #================================================= # ENSURE DOWNWARD COMPATIBILITY #================================================= From 495b2f684ec41a5a2100b30a1fd106344b8885bd Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 3 Nov 2022 20:57:16 +0000 Subject: [PATCH 55/55] 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 10d424b..6fc7650 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:** 25.0.0~ynh1 +**Shipped version:** 25.0.1~ynh1 **Demo:** https://demo.nextcloud.com/ diff --git a/README_fr.md b/README_fr.md index 772331b..e441d52 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 :** 25.0.0~ynh1 +**Version incluse :** 25.0.1~ynh1 **Démo :** https://demo.nextcloud.com/