1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/ffsync_ynh.git synced 2024-09-03 18:26:38 +02:00

Merge pull request #28 from YunoHost-Apps/testing

Testing
This commit is contained in:
Alexandre Aubin 2021-04-24 14:25:07 +02:00 committed by GitHub
commit 4847dadcf7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 32 additions and 15 deletions

View file

@ -1,4 +1,4 @@
# Mozillas Sync Server for Yunohost
# Mozillas 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.

View file

@ -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.

View file

@ -6,7 +6,7 @@
"en": "Mozillas 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": ">= 4.1"
},
"multi_instance": true,
"services": [

View file

@ -133,7 +133,7 @@ set_permissions
ynh_script_progression --message="Configuring permissions"
# accessible by everyone (authentification is done by firefox accounts)
ynh_app_setting_set --app=$app --key=skipped_uris --value="/"
ynh_permission_update --permission=main --add=visitors --protected=true --show_tile=true
#=================================================
# RELOAD Services

View file

@ -24,6 +24,17 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
#=================================================
# STANDARD REMOVE
#=================================================
# REMOVE SERVICE INTEGRATION IN YUNOHOST
#=================================================
# Remove the service from the list of services known by YunoHost (added from `yunohost service add`)
if ynh_exec_warn_less yunohost service status $app >/dev/null
then
ynh_script_progression --message="Removing $app service integration..." --weight=1
yunohost service remove $app
fi
#=================================================
# STOP AND REMOVE SERVICE
#=================================================

View file

@ -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

View file

@ -155,10 +155,17 @@ ynh_script_progression --message="Securing files and directories..."
set_permissions
#=================================================
# SETUP SSOWAT
# Migrate legacy permissions to new system
#=================================================
ynh_app_setting_set --app=$app --key=skipped_uris --value="/"
ynh_script_progression --message="Set permissions..."
if ynh_legacy_permissions_exists
then
ynh_legacy_permissions_delete_all
ynh_app_setting_delete --app=$app --key=is_public
fi
ynh_permission_update --permission=main --add=visitors --protected=true --show_tile=true
ynh_script_progression --message="Restarting $app services..." --weight=3
ynh_systemd_action --service_name "uwsgi-app@$app.service" \