diff --git a/README.md b/README.md index df6b8e2..f5e69b1 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Turtl for YunoHost -[![Integration level](https://dash.yunohost.org/integration/turtl.svg)](https://dash.yunohost.org/appci/app/turtl) ![](https://ci-apps.yunohost.org/ci/badges/turtl.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/turtl.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/turtl.svg)](https://dash.yunohost.org/appci/app/turtl) ![Working status](https://ci-apps.yunohost.org/ci/badges/turtl.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/turtl.maintain.svg) [![Install Turtl with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=turtl) *[Lire ce readme en français.](./README_fr.md)* @@ -37,31 +37,30 @@ Turtl is a free online service that allows you to create, synchronize and find y - An open-source server allows you to host your own Turtl data -**Shipped version:** 1.0~ynh1 - - +**Shipped version:** 1.0~ynh2 ## Screenshots -![](./doc/screenshots/screenshot.png) +![Screenshot of Turtl](./doc/screenshots/screenshot.png) ## Documentation and resources -* Official app website: https://turtlapp.com -* Official admin documentation: https://turtlapp.com/docs/ -* Upstream app code repository: https://github.com/turtl/server -* YunoHost documentation for this app: https://yunohost.org/app_turtl -* Report a bug: https://github.com/YunoHost-Apps/turtl_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/turtl_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/turtl_ynh/tree/testing --debug or sudo yunohost app upgrade turtl -u https://github.com/YunoHost-Apps/turtl_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 26b343a..c2ffda3 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,15 +1,19 @@ + + # Turtl pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/turtl.svg)](https://dash.yunohost.org/appci/app/turtl) ![](https://ci-apps.yunohost.org/ci/badges/turtl.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/turtl.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/turtl.svg)](https://dash.yunohost.org/appci/app/turtl) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/turtl.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/turtl.maintain.svg) [![Installer Turtl avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=turtl) *[Read this readme in english.](./README.md)* -*[Lire ce readme en français.](./README_fr.md)* -> *Ce package vous permet d'installer Turtl 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 Turtl 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 Turtl is a free online service that allows you to create, synchronize and find your notes, in an encrypted manner. @@ -33,31 +37,30 @@ Turtl is a free online service that allows you to create, synchronize and find y - An open-source server allows you to host your own Turtl data -**Version incluse :** 1.0~ynh1 +**Version incluse :** 1.0~ynh2 +## Captures d’écran - -## Captures d'écran - -![](./doc/screenshots/screenshot.png) +![Capture d’écran de Turtl](./doc/screenshots/screenshot.png) ## Documentations et ressources -* Site officiel de l'app : https://turtlapp.com -* Documentation officielle de l'admin : https://turtlapp.com/docs/ -* Dépôt de code officiel de l'app : https://github.com/turtl/server -* Documentation YunoHost pour cette app : https://yunohost.org/app_turtl -* Signaler un bug : https://github.com/YunoHost-Apps/turtl_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/turtl_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/turtl_ynh/tree/testing --debug ou sudo yunohost app upgrade turtl -u https://github.com/YunoHost-Apps/turtl_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 diff --git a/conf/nginx.conf b/conf/nginx.conf index 83c83e2..693fc36 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,4 +1,5 @@ -location / { +#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; +location __PATH__/ { proxy_pass http://127.0.0.1:__PORT__; proxy_redirect off; diff --git a/manifest.json b/manifest.json index 8c80a2d..855c7ee 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Share notes, bookmarks, and documents for sensitive projects", "fr": "Partagez des notes, des marque-pages et autre documents pour des projets sensibles" }, - "version": "1.0~ynh1", + "version": "1.0~ynh2", "url": "https://turtlapp.com", "upstream": { "license": "MIT", @@ -21,7 +21,7 @@ "url": "https://framasoft.org" }, "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.0.9" }, "multi_instance": false, "services": [ diff --git a/scripts/_common.sh b/scripts/_common.sh index 538dd0d..4b296a4 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,7 +7,7 @@ # dependencies used by the app pkg_dependencies="postgresql postgresql-contrib" -nodejs_version=12 +nodejs_version=14 version_commit=0e59ee0a47fc5937600999d14ceb1aca6392aec8 #================================================= diff --git a/scripts/backup b/scripts/backup index aa60d39..9b35dbc 100755 --- a/scripts/backup +++ b/scripts/backup @@ -15,7 +15,7 @@ source /usr/share/yunohost/helpers #================================================= ynh_clean_setup () { - true + ynh_clean_check_starting } # Exit if an error occurs during the execution of the script ynh_abort_if_errors diff --git a/scripts/upgrade b/scripts/upgrade index 76e98fe..5ca6dc6 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -27,7 +27,6 @@ port=$(ynh_app_setting_get --app=$app --key=port) #================================================= # CHECK VERSION #================================================= -ynh_script_progression --message="Checking version..." upgrade_type=$(ynh_check_app_version_changed)