diff --git a/README.md b/README.md index 94b9094..5d9f9fa 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,9 @@ # Mozilla’s Sync Server for 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.png)](https://install-app.yunohost.org/?app=ffsync) +*[Lire ce readme en français.](./README_fr.md)* > *This package allow you to install ffsync quickly and simply on a YunoHost server. If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.* @@ -12,22 +13,20 @@ The Sync Server provides a replacement for Firefox’s default server (hosted at By default, a server set up will defer authentication to the Mozilla-hosted accounts server at [https://accounts.firefox.com](https://accounts.firefox.com). So you will still have to authenticate at Mozilla, but _the storage of your information will be done on your host_. -**Shipped version:** 1.8 - -## Configuration - -Once installed, reaching `http://domain.tld/path` should show a page explaining how to configure it. Otherwise please refer to the [Yunohost page](https://yunohost.org/#/app_ffsync). +**Shipped version:** 1.9.1 ## Documentation * Official documentation: https://docs.services.mozilla.com/howtos/run-sync-1.5.html - * YunoHost documentation: There no other documentations, feel free to contribute. + * YunoHost documentation: https://yunohost.org/#/app_ffsync -## YunoHost specific features +## Configuration + +Once installed, reaching `http://domain.tld/path` should show a page explaining how to configure it. #### Supported architectures -* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/ffsync%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/ffsync/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/ffsync%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/ffsync/) * ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/ffsync%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/ffsync/) ## Links @@ -42,7 +41,6 @@ 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. ``` sudo yunohost app install https://github.com/YunoHost-Apps/ffsync_ynh/tree/testing --debug diff --git a/README_fr.md b/README_fr.md new file mode 100644 index 0000000..5b10a57 --- /dev/null +++ b/README_fr.md @@ -0,0 +1,48 @@ +# Serveur de synchronisation de Firefox pour Yunohost + +[![Integration level](https://dash.yunohost.org/integration/ffsync.svg)](https://dash.yunohost.org/appci/app/ffsync) +[![Install ffsync with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=ffsync) + +*[Read this readme in english.](./README.md)* +> *Ce package vous permet d'installer ffsync 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 + +Le serveur de synchronisation permet un remplacement du serveur par défaut de Firefox (hébergé par Mozilla). + +Par défaut, le serveur reporte l'authentification aux serveurs de comptes de Mozilla à https://accounts.firefox.com. vous vous authentifierez donc sur les serveurs de Mozilla, mais _le stockage de vos informations se fera sur votre serveur_. + +**Version incluse :** 1.9.1 + +## Documentation + + * Documentation officialle : https://docs.services.mozilla.com/howtos/run-sync-1.5.html + * Documentation YunoHost : https://yunohost.org/#/app_ffsync + +## Configuration + +Une fois installé, la page `http://domain.tld/path` vous explique comment l'utiliser. + +#### Architectures supportées + +* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/ffsync%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/ffsync/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/ffsync%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/ffsync/) + +## Liens + + * Rapporter un bug : https://github.com/YunoHost-Apps/ffsync_ynh/issues + * Dépôt de Sync Server : https://github.com/mozilla-services/syncserver + * Site de YunoHost : https://yunohost.org/ + +--- +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. +``` +sudo yunohost app install https://github.com/YunoHost-Apps/ffsync_ynh/tree/testing --debug +ou +sudo yunohost app upgrade ffsync -u https://github.com/YunoHost-Apps/ffsync_ynh/tree/testing --debug +``` diff --git a/conf/app.src b/conf/app.src index 28519e2..6031eac 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,4 +1,4 @@ -SOURCE_URL=https://github.com/mozilla-services/syncserver/archive/1.8.0.tar.gz -SOURCE_SUM=728206bcffec7a305e97e7cd4d465b3fa56f39f8e1fd55d98e49a866016d61e0 +SOURCE_URL=https://github.com/mozilla-services/syncserver/archive/bfbc3abd36ee4db70df13a9c43f7758a1528c965.zip +SOURCE_SUM=6f8fe5c039354a521c2697c547d89c56e030f7b780fcc1d96377708cd734ea53 SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=tar.gz +SOURCE_FORMAT=zip diff --git a/manifest.json b/manifest.json index 26ea838..574b4cc 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.8.0~ynh1", + "version": "1.9.1~ynh1", "url": "https://github.com/mozilla-services/syncserver", "license": "MPL-2.0", "maintainer": { diff --git a/scripts/_common.sh b/scripts/_common.sh index 1d036b4..d83cb4d 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,7 +7,7 @@ # Note that we also need some specific pkg_dependencies for build with arm architectures # dependencies used by the app -pkg_dependencies="python-dev python-virtualenv virtualenv uwsgi uwsgi-plugin-python build-essential libssl-dev libffi-dev" +pkg_dependencies="python-dev python-virtualenv virtualenv uwsgi uwsgi-plugin-python build-essential libssl-dev libffi-dev libmariadbclient-dev" #================================================= # PERSONAL HELPERS diff --git a/scripts/restore b/scripts/restore index 63bb1d6..f481d56 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_app_setting_get --app=$app --key=path) +path_url=$(ynh_normalize_url_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 1904fc1..910bf16 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -18,7 +18,7 @@ ynh_script_progression --message="Loading installation settings..." app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) -path_url=$(ynh_app_setting_get --app=$app --key=path) +path_url=$(ynh_normalize_url_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) secret=$(ynh_app_setting_get --app $app --key=secret) @@ -142,6 +142,10 @@ 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' +# Upgrade database table +ynh_mysql_execute_as_root --sql='ALTER TABLE `users` ADD COLUMN IF NOT EXISTS `keys_changed_at` BIGINT NULL AFTER `replaced_at`;' --database=$db_name +ynh_mysql_execute_as_root --sql='ALTER TABLE `users` ADD COLUMN IF NOT EXISTS `node` VARCHAR(255) NULL AFTER `keys_changed_at`;' --database=$db_name + #================================================= # GENERIC FINALIZATION #=================================================