From e8268a2c56e139a76d81b0ae74cc9494f22de138 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 21 Jan 2021 13:26:13 +0100 Subject: [PATCH] Fix linter warnings --- README.md | 7 +++---- README_fr.md | 10 +++++----- manifest.json | 4 ++-- scripts/install | 7 +++++++ scripts/restore | 2 +- scripts/upgrade | 7 +++++++ 6 files changed, 25 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 985955c..ad22de5 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Mozilla’s Sync Server for Yunohost +# Mozilla’s Sync Server for YunoHost [![Integration level](https://dash.yunohost.org/integration/ffsync.svg)](https://dash.yunohost.org/appci/app/ffsync) ![](https://ci-apps.yunohost.org/ci/badges/ffsync.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/ffsync.maintain.svg) [![Install ffsync with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=ffsync) @@ -17,7 +17,7 @@ By default, a server set up will defer authentication to the Mozilla-hosted acco ## Documentation - * Official documentation: https://docs.services.mozilla.com/howtos/run-sync-1.5.html + * Official documentation: https://mozilla-services.readthedocs.io/en/latest/howtos/run-sync-1.5.html * YunoHost documentation: https://yunohost.org/#/app_ffsync ## Configuration @@ -37,8 +37,7 @@ Once installed, reaching `http://domain.tld/path` should show a page explaining --- -Developers info ----------------- +## Developers info Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/ffsync_ynh/tree/testing). To try the testing branch, please proceed like that. diff --git a/README_fr.md b/README_fr.md index a60fb0a..84b3024 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,6 +1,6 @@ -# Serveur de synchronisation de Firefox pour Yunohost +# Serveur de synchronisation de Firefox pour YunoHost -[![Integration level](https://dash.yunohost.org/integration/ffsync.svg)](https://dash.yunohost.org/appci/app/ffsync) +[![Integration level](https://dash.yunohost.org/integration/ffsync.svg)](https://dash.yunohost.org/appci/app/ffsync) ![](https://ci-apps.yunohost.org/ci/badges/ffsync.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/ffsync.maintain.svg) [![Install ffsync with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=ffsync) *[Read this readme in english.](./README.md)* @@ -17,7 +17,7 @@ Par défaut, le serveur reporte l'authentification aux serveurs de comptes de Mo ## Documentation - * Documentation officialle : https://docs.services.mozilla.com/howtos/run-sync-1.5.html + * Documentation officialle : https://mozilla-services.readthedocs.io/en/latest/howtos/run-sync-1.5.html * Documentation YunoHost : https://yunohost.org/#/app_ffsync ## Configuration @@ -36,8 +36,8 @@ Une fois installé, la page `http://domain.tld/path` vous explique comment l'uti * Site de YunoHost : https://yunohost.org/ --- -Informations pour les développeurs ----------------- + +## Informations pour les développeurs Merci de faire votre « pull request » sur la [branche testing](https://github.com/YunoHost-Apps/ffsync_ynh/tree/testing). Pour tester la branche testing, faites comme ceci. diff --git a/manifest.json b/manifest.json index 574b4cc..c578ce2 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Mozilla’s Sync-Server to host your Firefox account data", "fr": "Le serveur de synchronisation de Mozilla, pour héberger vos données Firefox" }, - "version": "1.9.1~ynh1", + "version": "1.9.1~ynh2", "url": "https://github.com/mozilla-services/syncserver", "license": "MPL-2.0", "maintainer": { @@ -21,7 +21,7 @@ "email": "jean-baptiste@holcroft.fr" }], "requirements": { - "yunohost": ">= 3.5" + "yunohost": ">= 3.8.1" }, "multi_instance": true, "services": [ diff --git a/scripts/install b/scripts/install index 0ba638a..646a672 100644 --- a/scripts/install +++ b/scripts/install @@ -110,6 +110,13 @@ ln -s "/etc/uwsgi/apps-available/$app.ini" "$final_path/syncserver.ini" # configure uwsgi ynh_add_uwsgi_service 'domain secret db_user db_pwd db_name' +#================================================= +# INTEGRATE SERVICE IN YUNOHOST +#================================================= +ynh_script_progression --message="Integrating service in YunoHost..."--weight=1 + +yunohost service add "uwsgi-app@$app" --log "/var/log/uwsgi/$app/$app.log" + #================================================= # MODIFY A CONFIG FILE #================================================= diff --git a/scripts/restore b/scripts/restore index 7e9f87f..39f4023 100644 --- a/scripts/restore +++ b/scripts/restore @@ -23,7 +23,7 @@ ynh_script_progression --message="Loading settings..." app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) -path_url=$(ynh_normalize_url_path --path_url $(ynh_app_setting_get --app $app --key path)) +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 diff --git a/scripts/upgrade b/scripts/upgrade index 69a52c1..3476bc1 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -154,6 +154,13 @@ ynh_script_progression --message="Securing files and directories..." # Set permissions on app files set_permissions +#================================================= +# INTEGRATE SERVICE IN YUNOHOST +#================================================= +ynh_script_progression --message="Integrating service in YunoHost..."--weight=1 + +yunohost service add "uwsgi-app@$app" --log "/var/log/uwsgi/$app/$app.log" + #================================================= # SETUP SSOWAT #=================================================