mirror of
https://github.com/YunoHost-Apps/ffsync_ynh.git
synced 2024-09-03 18:26:38 +02:00
Merge branch 'testing' into master
This commit is contained in:
Josué Tille
commit
8b13159cee
7 changed files with 67 additions and 17 deletions
18
README.md
18
README.md
|
|
@ -1,8 +1,9 @@
|
|||
# Mozilla’s Sync Server for Yunohost
|
||||
|
||||
[](https://dash.yunohost.org/appci/app/ffsync)
|
||||
[](https://dash.yunohost.org/appci/app/ffsync)  
|
||||
[](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 - [](https://ci-apps.yunohost.org/ci/apps/ffsync/)
|
||||
* x86-64 - [](https://ci-apps.yunohost.org/ci/apps/ffsync/)
|
||||
* ARMv8-A - [](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
|
||||
|
|
|
|||
48
README_fr.md
Normal file
48
README_fr.md
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
# Serveur de synchronisation de Firefox pour Yunohost
|
||||
|
||||
[](https://dash.yunohost.org/appci/app/ffsync)
|
||||
[](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 - [](https://ci-apps.yunohost.org/ci/apps/ffsync/)
|
||||
* ARMv8-A - [](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
|
||||
```
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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": {
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
#=================================================
|
||||
|
|
|
|||
Loading…
Reference in a new issue