From bb241a9d1b2ffae6cedb9db1120da67145cdcfd7 Mon Sep 17 00:00:00 2001 From: Jimmy Monin Date: Sun, 27 May 2018 15:42:00 +0200 Subject: [PATCH] Fix path_url bug and more comments --- scripts/change_url | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index 700b0e2..b6eeec8 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -66,19 +66,25 @@ nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf # Change the path in the nginx config file if [ $change_path -eq 1 ] then + # Make a backup of the original nginx config file if modified + ynh_backup_if_checksum_is_different "$nginx_conf_path" + # Set global variables for nginx helper domain="$old_domain" path_url="$new_path" + # Store path_url setting + ynh_app_setting_set $app path_url "$path_url" + # Create a dedicated nginx config ynh_add_nginx_config if [ "$path_url" = "/" ] then # Replace "//" location (due to nginx template) # Prevent from replacing in "http://" expressions by excluding ":" as preceding character - sed --in-place "s@\([^:]\)//@\1/@g" /etc/nginx/conf.d/$domain.d/$app.conf + sed --in-place "s@\([^:]\)//@\1/@g" "$nginx_conf_path" else # Move prefix comment #for-subdir at end of lines - sed --in-place "s/#for-subdir\(.*\)/\1 #for-subdir/g" /etc/nginx/conf.d/$domain.d/$app.conf + sed --in-place "s/#for-subdir\(.*\)/\1 #for-subdir/g" "$nginx_conf_path" fi - ynh_store_file_checksum "/etc/nginx/conf.d/$domain.d/$app.conf" + ynh_store_file_checksum "$nginx_conf_path" fi # Change the domain for nginx @@ -99,7 +105,7 @@ fi ynh_mysql_connect_as "$db_name" "$db_pwd" "$db_user" <<< "UPDATE craue_config_setting SET value = 'https://$new_domain$new_path' WHERE name = 'wallabag_url'" # Change domain name in parameters.yml -ynh_replace_string "domain_name: https://$old_domain$old_path" "domain_name: https://$new_domain$new_path" $final_path/app/config/parameters.yml +ynh_replace_string "domain_name: .*" "domain_name: https://$new_domain$new_path" $final_path/app/config/parameters.yml # If "Download images locally" option has been enabled in Internal Settings download_images_enabled=$(ynh_mysql_connect_as "$db_name" "$db_pwd" "$db_user" <<< "SELECT value from craue_config_setting WHERE name='download_images_enabled '" | tail -n 1)