From 5dc6ed86367ef27f34ca06c379fcb3ff10f88d37 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 9 May 2022 17:09:58 +0200 Subject: [PATCH] Fix --- check_process | 1 - scripts/install | 2 +- scripts/upgrade | 10 ++-------- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/check_process b/check_process index c36bb46..eb259bd 100644 --- a/check_process +++ b/check_process @@ -24,7 +24,6 @@ upgrade=1 from_commit=a302e339956009004ece10bec8028f26a59d665e backup_restore=1 multi_instance=1 - port_already_use=0 change_url=0 ;;; Options Email=anmol@datamol.org diff --git a/scripts/install b/scripts/install index 2452617..deab0f4 100755 --- a/scripts/install +++ b/scripts/install @@ -119,7 +119,7 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= ynh_script_progression --message="Installing composer dependencies..." -ynh_exec_warn_less ynh_install_composer --phpversion="$phpversion" --workdir="$final_path" +ynh_exec_warn_less ynh_install_composer --phpversion="$phpversion" --workdir="$final_path" --install_args="--ignore-platform-req=ext-redis" chmod 750 "$final_path" chmod -R o-rwx "$final_path" diff --git a/scripts/upgrade b/scripts/upgrade index 30211f4..2bc2baa 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -88,7 +88,7 @@ then ynh_script_progression --message="Upgrading source files..." # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" + ynh_setup_source --dest_dir="$final_path" --keep="$final_path/.env" fi chmod 750 "$final_path" @@ -143,13 +143,7 @@ config="$final_path/.env" ynh_backup_if_checksum_is_different --file="$config" cp ../conf/.env "$config" -ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="$config" -ynh_replace_string --match_string="__RANDOM_KEY__" --replace_string="$random_key" --target_file="$config" -ynh_replace_string --match_string="__DB_USER__" --replace_string="$db_name" --target_file="$config" -ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$config" -ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$config" -ynh_replace_string --match_string="__EMAIL__" --replace_string="$email" --target_file="$config" -ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$config" +ynh_add_config --template="../conf/.env" --destination="$config" #================================================= # DEPLOYMENT