diff --git a/README.md b/README.md index 2aa1030..985955c 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # 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.png)](https://install-app.yunohost.org/?app=ffsync) +[![Install ffsync with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](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. diff --git a/README_fr.md b/README_fr.md index 5b10a57..a60fb0a 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,7 +1,7 @@ # 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) +[![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)* > *Ce package vous permet d'installer ffsync rapidement et simplement sur un serveur Yunohost. diff --git a/scripts/backup b/scripts/backup index c7f1bfd..5b51f01 100644 --- a/scripts/backup +++ b/scripts/backup @@ -20,7 +20,7 @@ ynh_abort_if_errors #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." +ynh_print_info --message="Loading installation settings..." app=$YNH_APP_INSTANCE_NAME @@ -33,30 +33,30 @@ db_name=$(ynh_app_setting_get --app=$app --key=db_name) #================================================= # BACKUP THE APP MAIN DIR #================================================= -ynh_script_progression --message="Backing up the main app directory..." +ynh_print_info --message="Backing up the main app directory..." ynh_backup --src_path="$final_path" #================================================= # BACKUP THE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Backing up nginx web server configuration..." +ynh_print_info --message="Backing up nginx web server configuration..." ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= # BACKUP THE MYSQL DATABASE #================================================= -ynh_script_progression --message="Backing up the MySQL database..." +ynh_print_info --message="Backing up the MySQL database..." ynh_mysql_dump_db --database="$db_name" > db.sql #================================================= # SPECIFIC BACKUP #================================================= # Backup Log -ynh_script_progression --message="Backing up logs" +ynh_print_info --message="Backing up logs" ynh_backup --src_path="/var/log/uwsgi/$app" # BACKUP THE UWSGI FILES -ynh_script_progression --message="Backing up UWSGI..." +ynh_print_info --message="Backing up UWSGI..." ynh_backup --src_path="/etc/uwsgi/apps-available/$app.ini" ynh_backup --src_path="/etc/systemd/system/uwsgi-app@.service" @@ -64,4 +64,4 @@ ynh_backup --src_path="/etc/systemd/system/uwsgi-app@.service" # END OF SCRIPT #================================================= -ynh_script_progression --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." --last +ynh_print_info --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." diff --git a/scripts/remove b/scripts/remove index fe5a3a6..009fe57 100644 --- a/scripts/remove +++ b/scripts/remove @@ -24,17 +24,6 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= # STANDARD REMOVE -#================================================= -# REMOVE UWSGI -#================================================= - -# Remove the service from the list of services known by Yunohost (added from `yunohost service add`) -if ynh_exec_warn_less yunohost service status uwsgi-app@$app >/dev/null -then - ynh_print_info --message="Removing $app service..." - yunohost service remove uwsgi-app@$app -fi - #================================================= # STOP AND REMOVE SERVICE #================================================= diff --git a/scripts/restore b/scripts/restore index 29fa948..7e9f87f 100644 --- a/scripts/restore +++ b/scripts/restore @@ -81,12 +81,11 @@ ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./ # INTEGRATE SERVICE IN YUNOHOST #================================================= -yunohost service add "uwsgi-app@$app" --log "/var/log/uwsgi/app/$app" - ynh_script_progression --message="Reloading services..." --weight=3 ynh_check_global_uwsgi_config systemctl enable "uwsgi-app@$app" --quiet +yunohost service add "uwsgi-app@$app" --log "/var/log/uwsgi/$app/$app.log" #================================================= # GENERIC FINALIZATION