diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index 17ee9e8..497d1ab 100755 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -1,6 +1,6 @@ ### Important points to read before installing -- [Pleroma (Yunohost ver.)](https://github.com/YunoHost-Apps/pleroma_ynh) must be installed locally before you install SoapboxFE +- [Pleroma (YunoHost ver.)](https://github.com/YunoHost-Apps/pleroma_ynh) must be installed locally before you install SoapboxFE - SoapboxFE must be installed under a Pleroma domain (i.e soapboxfe.your-pleroma-instance-domain.net) - AdminFE under SoapboxFE returns 404 diff --git a/manifest.json b/manifest.json index 5ad519a..0eda829 100755 --- a/manifest.json +++ b/manifest.json @@ -32,7 +32,7 @@ "type": "domain", "ask": { "en": "Subdomain for SoapboxFE installation, i.e: soapbox.your-pleroma.instance.com", - "fr": "Subdomain for SoapboxFE installation, i.e: soapbox.your-pleroma.instance.com" + "fr": "Sous-domaine pour l'installation de SoapboxFE, par exemple : soapbox.your-pleroma.instance.com" } }, { @@ -40,7 +40,7 @@ "type": "domain", "ask": { "en": "The root domain of Pleroma instance installed", - "fr": "The root domain of pleroma instance installed" + "fr": "Le domaine racine de l'instance pleroma installée" } }, { diff --git a/scripts/install b/scripts/install index 2071194..adcc4af 100755 --- a/scripts/install +++ b/scripts/install @@ -40,7 +40,7 @@ ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url #================================================= # STORE SETTINGS FROM MANIFEST #================================================= -ynh_script_progression --message="Storing installation settings..." +ynh_script_progression --message="Storing installation settings..." --weight=1 ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=backend --value=$backend @@ -81,7 +81,7 @@ ynh_add_nginx_config #================================================= # SETUP SSOWAT #================================================= -ynh_script_progression --message="Configuring permissions..." +ynh_script_progression --message="Configuring permissions..." --weight=1 # Make app public if necessary if [ $is_public -eq 1 ] @@ -92,7 +92,7 @@ fi #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." +ynh_script_progression --message="Reloading NGINX web server..." --weight=2 ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/remove b/scripts/remove index 077f2fe..52ef7ab 100755 --- a/scripts/remove +++ b/scripts/remove @@ -24,7 +24,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= # REMOVE APP MAIN DIR #================================================= -ynh_script_progression --message="Removing app main directory..." +ynh_script_progression --message="Removing app main directory..." --weight=2 # Remove the app directory securely ynh_secure_remove --file="$final_path" @@ -42,7 +42,7 @@ ynh_remove_nginx_config #================================================= # REMOVE DEDICATED USER #================================================= -ynh_script_progression --message="Removing the dedicated system user..." +ynh_script_progression --message="Removing the dedicated system user..." --weight=2 # Delete a system user ynh_system_user_delete --username=$app diff --git a/scripts/restore b/scripts/restore index c8cfc6b..aa1a91c 100755 --- a/scripts/restore +++ b/scripts/restore @@ -31,8 +31,6 @@ path_url=$(ynh_app_setting_get --app=$app --key=path) #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=2 -ynh_webpath_available --domain=$domain --path_url=$path_url \ - || ynh_die --message="Path not available: ${domain}${path_url}" test ! -d $final_path \ || ynh_die --message="There is already a directory: $final_path " @@ -41,6 +39,7 @@ test ! -d $final_path \ #================================================= # RESTORE THE NGINX CONFIGURATION #================================================= +ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" @@ -68,7 +67,8 @@ chown -R $app:www-data "$final_path" #================================================= # RELOAD NGINX AND PHP-FPM #================================================= -ynh_script_progression --message="Reloading NGINX web server" +ynh_script_progression --message="Reloading NGINX web server" --weight=2 + ynh_systemd_action --service_name=nginx --action=reload #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 8034523..1d339db 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -72,12 +72,13 @@ ynh_system_user_create --username=$app --home_dir="$final_path" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= + if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading source files..." # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" --keep="static/instance/" + ynh_setup_source --dest_dir="$final_path" --keep="instance" fi chmod 750 "$final_path"