From ec56ba36852bb3303a43472af6230fd645aa8c6d 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 22:35:13 +0200 Subject: [PATCH 01/11] 3.0.9 --- conf/app.src | 5 ++--- manifest.json | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/conf/app.src b/conf/app.src index d04ac1d..e955f00 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,7 +1,6 @@ -SOURCE_URL=https://download.pydio.com/pub/cells/release/3.0.4/linux-amd64/pydio-cells-3.0.4-linux-amd64.zip +SOURCE_URL=https://download.pydio.com/pub/cells/release/3.0.9/linux-amd64/cells SOURCE_SUM=97e6bb779fed596b6fe11ed2aff8db0789d2f2f2b8bf8cd11e240dc3b76bf4b2 SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=false SOURCE_FILENAME= -SOURCE_EXTRACT=true +SOURCE_EXTRACT=false diff --git a/manifest.json b/manifest.json index f8ff71b..f5d4573 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": "3.0.9~ynh1", "url": "https://pydio.com", "upstream": { "license": "AGPL-3.0-or-later", From 82f384862b752b7fceac6e61794eeaf5d5d88233 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 16 Jul 2023 20:35:17 +0000 Subject: [PATCH 02/11] Auto-update README --- README.md | 24 ++++++++++++------------ README_fr.md | 38 +++++++++++++++++++++----------------- 2 files changed, 33 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index 2a1e091..6229f03 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)* @@ -17,31 +18,30 @@ 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:** 3.0.9~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..e320feb 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 +**Version incluse :** 3.0.9~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 ef098832ec510c0c1389c988501f0c4e8e7f63f5 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 22:36:33 +0200 Subject: [PATCH 03/11] fix --- scripts/upgrade | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/upgrade b/scripts/upgrade index 370f361..62d60e4 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -90,6 +90,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 From 784f83e4ddef10ad5d76698559dedd093b0286e2 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 22:44:16 +0200 Subject: [PATCH 04/11] fix --- conf/app.src | 2 +- scripts/install | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/app.src b/conf/app.src index e955f00..ee83f94 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ SOURCE_URL=https://download.pydio.com/pub/cells/release/3.0.9/linux-amd64/cells -SOURCE_SUM=97e6bb779fed596b6fe11ed2aff8db0789d2f2f2b8bf8cd11e240dc3b76bf4b2 +SOURCE_SUM=4272ca1e10f2ca08d08d7d08d440d4b6e3d09ba37235f54bdbac1ac7c29b2aaa SOURCE_SUM_PRG=sha256sum SOURCE_IN_SUBDIR=false SOURCE_FILENAME= 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 From 4f30081c605d07cf3d06a67e478f634360e82254 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 22:49:35 +0200 Subject: [PATCH 05/11] Update app.src --- conf/app.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/app.src b/conf/app.src index ee83f94..d6af588 100644 --- a/conf/app.src +++ b/conf/app.src @@ -2,5 +2,5 @@ SOURCE_URL=https://download.pydio.com/pub/cells/release/3.0.9/linux-amd64/cells SOURCE_SUM=4272ca1e10f2ca08d08d7d08d440d4b6e3d09ba37235f54bdbac1ac7c29b2aaa SOURCE_SUM_PRG=sha256sum SOURCE_IN_SUBDIR=false -SOURCE_FILENAME= +SOURCE_FILENAME=cells SOURCE_EXTRACT=false From 9a55b628a7c9daa574ee156bc25326ac626ffcd2 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 22:49:46 +0200 Subject: [PATCH 06/11] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 986f1ee..f3c28b4 100644 --- a/scripts/install +++ b/scripts/install @@ -99,7 +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" +#chmod +x "$final_path/cells" #================================================= # NGINX CONFIGURATION From 1474ea5d8eca088c19536b9c8c6c4d19c99c546f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 17 Jul 2023 10:06:24 +0200 Subject: [PATCH 07/11] Update install --- scripts/install | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/install b/scripts/install index f3c28b4..e007140 100644 --- a/scripts/install +++ b/scripts/install @@ -128,16 +128,16 @@ chown -R $app:www-data "$datadir" #================================================= # ADD A CONFIGURATION #================================================= -ynh_script_progression --message="Adding a configuration file..." +#ynh_script_progression --message="Adding a configuration file..." -ynh_add_config --template="../conf/install-conf.yml" --destination="$final_path/install-conf.yml" -ynh_delete_file_checksum --file="$final_path/install-conf.yml" +#ynh_add_config --template="../conf/install-conf.yml" --destination="$final_path/install-conf.yml" +#ynh_delete_file_checksum --file="$final_path/install-conf.yml" -pushd "$final_path" - ynh_exec_as $app ./cells configure --cli --yaml "$final_path/install-conf.yml" -popd +#pushd "$final_path" +# ynh_exec_as $app ./cells configure --cli --yaml "$final_path/install-conf.yml" +#popd -ynh_secure_remove --file="$final_path/install-conf.yml" +#ynh_secure_remove --file="$final_path/install-conf.yml" #================================================= # SETUP SYSTEMD From b6e9b5dbe857700e31a43182001f7ece243f3077 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 17 Jul 2023 10:08:41 +0200 Subject: [PATCH 08/11] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index e007140..ee774f8 100644 --- a/scripts/install +++ b/scripts/install @@ -162,7 +162,7 @@ yunohost service add $app ynh_script_progression --message="Starting a systemd service..." # Start a systemd service -ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Restart done" +#ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Restart done" #================================================= # SETUP SSOWAT From 9fdab0ad3aadf300ee3bd8d3f82fb0cb2728dfe7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 17 Jul 2023 10:12:12 +0200 Subject: [PATCH 09/11] Update install --- scripts/install | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/install b/scripts/install index ee774f8..986f1ee 100644 --- a/scripts/install +++ b/scripts/install @@ -99,7 +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" +chmod +x "$final_path/cells" #================================================= # NGINX CONFIGURATION @@ -128,16 +128,16 @@ chown -R $app:www-data "$datadir" #================================================= # ADD A CONFIGURATION #================================================= -#ynh_script_progression --message="Adding a configuration file..." +ynh_script_progression --message="Adding a configuration file..." -#ynh_add_config --template="../conf/install-conf.yml" --destination="$final_path/install-conf.yml" -#ynh_delete_file_checksum --file="$final_path/install-conf.yml" +ynh_add_config --template="../conf/install-conf.yml" --destination="$final_path/install-conf.yml" +ynh_delete_file_checksum --file="$final_path/install-conf.yml" -#pushd "$final_path" -# ynh_exec_as $app ./cells configure --cli --yaml "$final_path/install-conf.yml" -#popd +pushd "$final_path" + ynh_exec_as $app ./cells configure --cli --yaml "$final_path/install-conf.yml" +popd -#ynh_secure_remove --file="$final_path/install-conf.yml" +ynh_secure_remove --file="$final_path/install-conf.yml" #================================================= # SETUP SYSTEMD @@ -162,7 +162,7 @@ yunohost service add $app ynh_script_progression --message="Starting a systemd service..." # Start a systemd service -#ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Restart done" +ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Restart done" #================================================= # SETUP SSOWAT From 3969de22648468b313a0265b9f509b5c41b244fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 17 Jul 2023 10:13:02 +0200 Subject: [PATCH 10/11] Update upgrade --- scripts/upgrade | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 62d60e4..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) From ba1cc4cd484c4e6fb07a53c77c4ede070fbe8d55 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 17 Jul 2023 08:23:23 +0000 Subject: [PATCH 11/11] Auto-update README --- README.md | 1 - README_fr.md | 2 -- 2 files changed, 3 deletions(-) diff --git a/README.md b/README.md index 55b79f4..6229f03 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,6 @@ File sharing platform **Shipped version:** 3.0.9~ynh1 - ## Screenshots ![Screenshot of Pydio](./doc/screenshots/screenshot01.png) diff --git a/README_fr.md b/README_fr.md index 78ef993..e320feb 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,10 +18,8 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Plateforme de partage de fichiers - **Version incluse :** 3.0.9~ynh1 - ## Captures d’écran ![Capture d’écran de Pydio](./doc/screenshots/screenshot01.png)