From 196fb8cd4783885077dff0d58e3df22b8caa31fb Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 14 Jul 2023 17:03:55 +0000 Subject: [PATCH 1/4] Auto-update README --- README.md | 22 +++++++++++----------- README_fr.md | 36 ++++++++++++++++++++---------------- 2 files changed, 31 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index 2a1e091..9a0776f 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,8 @@ It shall NOT be edited by hand. # Pydio for YunoHost -[![Integration level](https://dash.yunohost.org/integration/pydio.svg)](https://dash.yunohost.org/appci/app/pydio) ![](https://ci-apps.yunohost.org/ci/badges/pydio.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/pydio.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/pydio.svg)](https://dash.yunohost.org/appci/app/pydio) ![Working status](https://ci-apps.yunohost.org/ci/badges/pydio.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/pydio.maintain.svg) + [![Install Pydio with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=pydio) *[Lire ce readme en français.](./README_fr.md)* @@ -19,29 +20,28 @@ File sharing platform **Shipped version:** 3.0.4~ynh1 - - ## Screenshots -![](./doc/screenshots/screenshot01.png) +![Screenshot of Pydio](./doc/screenshots/screenshot01.png) ## Documentation and resources -* Official app website: https://pydio.com -* Official admin documentation: https://pydio.com/en/docs/ -* Upstream app code repository: https://github.com/pydio/cells -* YunoHost documentation for this app: https://yunohost.org/app_pydio -* Report a bug: https://github.com/YunoHost-Apps/pydio_ynh/issues +* Official app website: +* 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/pydio_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/pydio_ynh/tree/testing --debug or sudo yunohost app upgrade pydio -u https://github.com/YunoHost-Apps/pydio_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 da0c775..466f72a 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,43 +1,47 @@ + + # Pydio pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/pydio.svg)](https://dash.yunohost.org/appci/app/pydio) ![](https://ci-apps.yunohost.org/ci/badges/pydio.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/pydio.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/pydio.svg)](https://dash.yunohost.org/appci/app/pydio) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/pydio.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/pydio.maintain.svg) + [![Installer Pydio avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=pydio) *[Read this readme in english.](./README.md)* -*[Lire ce readme en français.](./README_fr.md)* -> *Ce package vous permet d'installer Pydio 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.* +> *Ce package vous permet d’installer Pydio 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.* -## Vue d'ensemble +## Vue d’ensemble Plateforme de partage de fichiers **Version incluse :** 3.0.4~ynh1 +## Captures d’écran - -## Captures d'écran - -![](./doc/screenshots/screenshot01.png) +![Capture d’écran de Pydio](./doc/screenshots/screenshot01.png) ## Documentations et ressources -* Site officiel de l'app : https://pydio.com -* Documentation officielle de l'admin : https://pydio.com/en/docs/ -* Dépôt de code officiel de l'app : https://github.com/pydio/cells -* Documentation YunoHost pour cette app : https://yunohost.org/app_pydio -* Signaler un bug : https://github.com/YunoHost-Apps/pydio_ynh/issues +* Site officiel de l’app : +* 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/pydio_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/pydio_ynh/tree/testing --debug ou sudo yunohost app upgrade pydio -u https://github.com/YunoHost-Apps/pydio_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 :** \ No newline at end of file From 8fd2c8303736d4d52080d8da1664e0fc23b311f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 14 Jul 2023 19:05:23 +0200 Subject: [PATCH 2/4] fix --- conf/app.src | 4 ++-- conf/nginx.conf | 1 - manifest.json | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/conf/app.src b/conf/app.src index d04ac1d..7dba5e7 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://download.pydio.com/pub/cells/release/3.0.4/linux-amd64/pydio-cells-3.0.4-linux-amd64.zip -SOURCE_SUM=97e6bb779fed596b6fe11ed2aff8db0789d2f2f2b8bf8cd11e240dc3b76bf4b2 +SOURCE_URL=https://download.pydio.com/pub/cells/release/4.2.4/linux-amd64/pydio-cells-4.2.4-linux-amd64.zip +SOURCE_SUM=153a8350870ca8e221c09d96c300ed254f3af674e74f92f0eeb73c3d54c3ffdc SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=false diff --git a/conf/nginx.conf b/conf/nginx.conf index 484efd1..33263fe 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -6,7 +6,6 @@ location / { include conf.d/yunohost_panel.conf.inc; } - location /ws/ { proxy_pass https://localhost:__PORT__; proxy_http_version 1.1; diff --git a/manifest.json b/manifest.json index f8ff71b..06dba18 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "File sharing platform", "fr": "Plateforme de partage de fichiers" }, - "version": "3.0.4~ynh1", + "version": "4.2.4~ynh1", "url": "https://pydio.com", "upstream": { "license": "AGPL-3.0-or-later", @@ -21,7 +21,7 @@ "url": "https://github.com/julienmalik" }, "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.1.21" }, "multi_instance": true, "services": [ From d87c3f9a4c6cbafe6e07f0adf68178f8021748e4 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 14 Jul 2023 17:05:33 +0000 Subject: [PATCH 3/4] 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 9a0776f..cf3e885 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in File sharing platform -**Shipped version:** 3.0.4~ynh1 +**Shipped version:** 4.2.4~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 466f72a..ca98196 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Plateforme de partage de fichiers -**Version incluse :** 3.0.4~ynh1 +**Version incluse :** 4.2.4~ynh1 ## Captures d’écran From e9403e812b67aa67587cd687401d5d9a57ac8725 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 16 Jul 2023 21:27:24 +0200 Subject: [PATCH 4/4] fix --- scripts/install | 1 + scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index df4551c..986f1ee 100644 --- a/scripts/install +++ b/scripts/install @@ -99,6 +99,7 @@ ynh_setup_source --dest_dir="$final_path" chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" +chmod +x "$final_path/cells" #================================================= # NGINX CONFIGURATION diff --git a/scripts/upgrade b/scripts/upgrade index 370f361..bed3926 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -27,7 +27,6 @@ datadir=$(ynh_app_setting_get --app=$app --key=datadir) #================================================= # CHECK VERSION #================================================= -ynh_script_progression --message="Checking version..." upgrade_type=$(ynh_check_app_version_changed) @@ -90,6 +89,7 @@ fi chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" +chmod +x "$final_path/cells" #================================================= # NGINX CONFIGURATION