From 4449ee7ecb12dae2cf74bd84f69142f6d70d6015 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Fri, 10 Apr 2020 11:27:16 +0200 Subject: [PATCH] add a lines for doamin in config.local.php in change_url install and upgrade script --- scripts/change_url | 2 +- scripts/install | 2 +- scripts/upgrade | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index c771a7c..e1f1a17 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -83,7 +83,7 @@ then mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf # Store file checksum for the new config file location #ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" - ynh_replace_string --match_string="const WWW_URL = '$old_domain' . WWW_URI;" --replace_string="const WWW_URI = '$new_domain' . WWW_URI;" --target_file="$final_path/config.local.php" + ynh_replace_string --match_string="const WWW_URL = '$old_domain' . WWW_URI;" --replace_string="const WWW_URI = 'https:/$new_domain' . WWW_URI;" --target_file="$final_path/config.local.php" fi #================================================= diff --git a/scripts/install b/scripts/install index 6b83346..59563bd 100644 --- a/scripts/install +++ b/scripts/install @@ -131,7 +131,7 @@ systemctl reload nginx key=$(ynh_string_random --length=50) cp -a $final_path/config.dist.php $final_path/config.local.php ynh_replace_string --match_string="const SECRET_KEY = '3xUhIgGwuovRKOjVsVPQ5yUMfXUSIOX2GKzcebsz5OINrYC50r';" --replace_string="const SECRET_KEY = '$key';" --target_file="$final_path/config.local.php" -ynh_replace_string --match_string="//const WWW_URL = 'http://garradin.chezmoi.tld' . WWW_URI;" --replace_string="const WWW_URI = '$domain' . WWW_URI;" --target_file="$final_path/config.local.php" +ynh_replace_string --match_string="//const WWW_URL = 'http://garradin.chezmoi.tld' . WWW_URI;" --replace_string="const WWW_URI = 'https:/$domain' . WWW_URI;" --target_file="$final_path/config.local.php" if [ "$path_url" == "/" ] then ynh_replace_string --match_string="//const WWW_URI = '/asso/';" --replace_string="const WWW_URI = '$path_url';" --target_file="$final_path/config.local.php" diff --git a/scripts/upgrade b/scripts/upgrade index a0ba937..5d4a466 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -142,7 +142,7 @@ ynh_script_progression --message="final configuration needed..." --time --weight key=$(ynh_string_random --length=50) cp -a $final_path/config.dist.php $final_path/config.local.php ynh_replace_string --match_string="const SECRET_KEY = '3xUhIgGwuovRKOjVsVPQ5yUMfXUSIOX2GKzcebsz5OINrYC50r';" --replace_string="const SECRET_KEY = '$key';" --target_file="$final_path/config.local.php" -ynh_replace_string --match_string="//const WWW_URL = 'http://garradin.chezmoi.tld' . WWW_URI;" --replace_string="const WWW_URI = '$domain' . WWW_URI;" --target_file="$final_path/config.local.php" +ynh_replace_string --match_string="//const WWW_URL = 'http://garradin.chezmoi.tld' . WWW_URI;" --replace_string="const WWW_URI = 'https:/$domain' . WWW_URI;" --target_file="$final_path/config.local.php" if [ "$path_url" == "/" ] then ynh_replace_string --match_string="//const WWW_URI = '/asso/';" --replace_string="const WWW_URI = '$path_url';" --target_file="$final_path/config.local.php"