From 82b598b5ca33b5230c1f509767ecd87191a3565a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Sat, 12 May 2018 21:31:12 +0200 Subject: [PATCH] Fix from comment PR #462 --- data/helpers.d/backend | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/data/helpers.d/backend b/data/helpers.d/backend index a912cd337..8dce2df06 100644 --- a/data/helpers.d/backend +++ b/data/helpers.d/backend @@ -134,7 +134,7 @@ ynh_remove_systemd_config () { # __PORT_2__ by $port_2 # ynh_add_nginx_config () { - local finalnginxconf="/etc/nginx/conf.d/$domain.d/$app.conf" + finalnginxconf="/etc/nginx/conf.d/$domain.d/$app.conf" local others_var=${1:-} ynh_backup_if_checksum_is_different "$finalnginxconf" sudo cp ../conf/nginx.conf "$finalnginxconf" @@ -161,14 +161,18 @@ ynh_add_nginx_config () { fi # Replace all other variable given as arguments - for v in $others_var + for var_to_replace in $others_var do - ynh_replace_string "__${v^^}__" "${!v}" "$finalnginxconf" + # ${var_to_replace^^} make the content of the variable on upper-cases + # ${!var_to_replace} get the content of the variable named $var_to_replace + ynh_replace_string "__${var_to_replace^^}__" "${!var_to_replace}" "$finalnginxconf" done if [ "${path_url:-}" != "/" ] then ynh_replace_string "^#sub_path_only" "" "$finalnginxconf" + else + ynh_replace_string "^#root_path_only" "" "$finalnginxconf" fi ynh_store_file_checksum "$finalnginxconf"