diff --git a/scripts/change_url b/scripts/change_url index 73fe664..2c8cc62 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -24,7 +24,7 @@ app=$YNH_APP_INSTANCE_NAME #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --weight=1 +ynh_script_progression --message="Loading installation settings..." --weight=1 final_path=$(ynh_app_setting_get --app=$app --key=final_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) @@ -33,7 +33,7 @@ db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= -ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --time --weight=1 +ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=1 # Backup the current version of the app ynh_backup_before_upgrade @@ -99,20 +99,12 @@ fi #================================================= ynh_script_progression --message="Configuring $app..." --weight=1 -domain="$new_domain" -path_url="$new_path" +domain=$new_domain -ynh_backup_if_checksum_is_different --file="$final_path/config.php" +ynh_add_config --template="../conf/config.php" --destination="$final_path/config.php" -cp ../conf/config.php "$final_path/config.php" - -# Change domain name in config.php -ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$final_path/config.php" -ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$final_path/config.php" -ynh_replace_string --match_string="__DOMAIN_PATH__" --replace_string="https://$domain$path_url" --target_file="$final_path/config.php" - -# Recalculate and store the config file checksum into the app settings -ynh_store_file_checksum --file="$final_path/config.php" +chmod 400 "$final_path/config.php" +chown $app:$app "$final_path/config.php" #================================================= # GENERIC FINALIZATION diff --git a/scripts/install b/scripts/install index 27794fc..9ab39e3 100644 --- a/scripts/install +++ b/scripts/install @@ -105,12 +105,10 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= ynh_script_progression --message="Adding a configuration file..." --weight=1 -domain_path=https://$domain${path_url:1} - ynh_add_config --template="../conf/config.php" --destination="$final_path/config.php" chmod 400 "$final_path/config.php" -chown $app:$app "$final_path/config.php" +chown $app "$final_path/config.php" #================================================= # SETUP SSOWAT