From 0ad00ba293b80895837added08815ae003d92b08 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Thu, 4 Jun 2020 06:27:02 +0200 Subject: [PATCH] adjust syntax for new examples_ynh --- manifest.json | 2 +- scripts/change_url | 14 +------------- scripts/install | 4 ++-- scripts/remove | 7 +++---- scripts/restore | 4 ++-- scripts/upgrade | 5 ++--- 6 files changed, 11 insertions(+), 25 deletions(-) diff --git a/manifest.json b/manifest.json index afc5e46..5f89554 100644 --- a/manifest.json +++ b/manifest.json @@ -15,7 +15,7 @@ "url": "https://moul.re" }, "requirements": { - "yunohost": ">> 3.5.0" + "yunohost": ">> 3.7.0" }, "multi_instance": false, "services": [ diff --git a/scripts/change_url b/scripts/change_url index 776fce8..72a982b 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -52,18 +52,6 @@ ynh_script_progression --message="Updating nginx web server configuration..." nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf -## Move from sub path to root -#if [ "$new_path" == "/" ] -#then -# ynh_replace_string "\(^.*rewrite.*\^$old_path.* permanent;\)" "#sub_path_only\1" "$nginx_conf_path" -# ynh_replace_string "\(rewrite *\^\)$old_path\$ $old_path/*" "\1$new_path$ $new_path" "$nginx_conf_path" - -# Move to a sub path -#else -# ynh_replace_string "^#sub_path_only" "" "$nginx_conf_path" -# ynh_replace_string "\(rewrite *\^\)$old_path\$ $old_path/*" "\1$new_path$ $new_path/" "$nginx_conf_path" -#fi - # Change the path in the nginx config file if [ $change_path -eq 1 ] then @@ -92,7 +80,7 @@ fi #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." --time --weight=1 +ynh_script_progression --message="Reloading nginx web server..." ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/install b/scripts/install index 132e32d..a2b2c65 100755 --- a/scripts/install +++ b/scripts/install @@ -46,7 +46,7 @@ ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url #================================================= # STORE SETTINGS FROM MANIFEST #================================================= -ynh_script_progression --message="Storing installation settings..." --time --weight=1 +ynh_script_progression --message="Storing installation settings..." # Save app settings ynh_app_setting_set --app=$app --key=domain --value=$domain @@ -104,7 +104,7 @@ fi #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." --time --weight=1 +ynh_script_progression --message="Reloading nginx web server..." ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/remove b/scripts/remove index 99c0aa0..275c66a 100755 --- a/scripts/remove +++ b/scripts/remove @@ -11,7 +11,7 @@ source /usr/share/yunohost/helpers #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --time --weight=1 +ynh_script_progression --message="Loading installation settings..." app=$YNH_APP_INSTANCE_NAME @@ -30,7 +30,7 @@ ynh_secure_remove --file="$final_path" #================================================= # REMOVE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Removing nginx web server configuration..." --time --weight=1 +ynh_script_progression --message="Removing nginx web server configuration..." # Remove the dedicated nginx config ynh_remove_nginx_config @@ -38,8 +38,7 @@ ynh_remove_nginx_config #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." --time --weight=1 - +ynh_script_progression --message="Reloading nginx web server..." ynh_systemd_action --service_name=nginx --action=reload #================================================= diff --git a/scripts/restore b/scripts/restore index 5edab66..3ce8d38 100755 --- a/scripts/restore +++ b/scripts/restore @@ -23,7 +23,7 @@ ynh_abort_if_errors #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --time --weight=1 +ynh_script_progression --message="Loading installation settings..." app=$YNH_APP_INSTANCE_NAME @@ -68,7 +68,7 @@ chown -R www-data: $final_path #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server and php-fpm..." --time --weight=1 +ynh_script_progression --message="Reloading nginx web server..." ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/upgrade b/scripts/upgrade index e8d497a..bd7f001 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -11,8 +11,7 @@ source /usr/share/yunohost/helpers #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --time --weight=1 - +ynh_script_progression --message="Loading installation settings..." app=$YNH_APP_INSTANCE_NAME # Retrieve app settings @@ -129,7 +128,7 @@ fi #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." --time --weight=1 +ynh_script_progression --message="Reloading nginx web server..." ynh_systemd_action --service_name=nginx --action=reload