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

Merge branch 'testing' into enh-testing

This commit is contained in:
Alexandre Aubin 2021-04-12 18:07:43 +02:00 committed by GitHub
commit 44ff4e0c0b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 7 deletions

View file

@ -21,7 +21,7 @@
"email": "jean-baptiste@holcroft.fr" "email": "jean-baptiste@holcroft.fr"
}], }],
"requirements": { "requirements": {
"yunohost": ">= 3.8.1" "yunohost": ">= 4.1"
}, },
"multi_instance": true, "multi_instance": true,
"services": [ "services": [

View file

@ -124,3 +124,9 @@ ynh_remove_uwsgi_service () {
ynh_secure_remove --file="/etc/systemd/system/uwsgi-app@$app.service.d" ynh_secure_remove --file="/etc/systemd/system/uwsgi-app@$app.service.d"
fi fi
} }
ynh_restore_uwsgi_service () {
ynh_check_global_uwsgi_config
systemctl enable "uwsgi-app@$app" --quiet
yunohost service add "uwsgi-app@$app" --log "/var/log/uwsgi/$app/$app.log"
}

View file

@ -133,7 +133,7 @@ set_permissions
ynh_script_progression --message="Configuring permissions" ynh_script_progression --message="Configuring permissions"
# accessible by everyone (authentification is done by firefox accounts) # 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 # RELOAD Services

View file

@ -83,9 +83,7 @@ ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./
ynh_script_progression --message="Reloading services..." --weight=3 ynh_script_progression --message="Reloading services..." --weight=3
ynh_check_global_uwsgi_config ynh_restore_uwsgi_service
systemctl enable "uwsgi-app@$app" --quiet
yunohost service add "uwsgi-app@$app" --log "/var/log/uwsgi/$app/$app.log"
#================================================= #=================================================
# GENERIC FINALIZATION # GENERIC FINALIZATION

View file

@ -155,10 +155,17 @@ ynh_script_progression --message="Securing files and directories..."
set_permissions 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_script_progression --message="Restarting $app services..." --weight=3
ynh_systemd_action --service_name "uwsgi-app@$app.service" \ ynh_systemd_action --service_name "uwsgi-app@$app.service" \