From e5a2f210b80c6216877f01cc16e4828dd5a3d78d Mon Sep 17 00:00:00 2001 From: Gredin67 Date: Mon, 31 Jul 2023 17:35:08 +0200 Subject: [PATCH] $domain not initialized --- scripts/config | 2 +- scripts/install | 1 + scripts/upgrade | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/config b/scripts/config index e7991f5..2fdc008 100644 --- a/scripts/config +++ b/scripts/config @@ -14,7 +14,6 @@ ynh_abort_if_errors get_registration_disabled() { registration_disabled=$(ynh_app_setting_get --app $app --key registration_disabled) - domain=$(ynh_app_setting_get --app $app --key domain) echo "${registration_disabled}" } @@ -27,6 +26,7 @@ set__registration_disabled() { fi ynh_write_var_in_file --file=$install_dir/dendrite.yaml --key=registration_disabled --value="${registration_disabled}" + domain=$(ynh_app_setting_get --app $app --key domain) ynh_add_systemd_config ynh_systemd_action --service_name=$app --action="restart" --line_match="Starting external listener" --log_path="systemd" ynh_app_setting_set --app=$app --key=registration_disabled --value=$registration_disabled diff --git a/scripts/install b/scripts/install index c3ed8a5..2e49951 100644 --- a/scripts/install +++ b/scripts/install @@ -31,6 +31,7 @@ fi #================================================= ynh_app_setting_set --app=$app --key=server_name --value=$server_name +ynh_app_setting_set --app=$app --key=domain --value=$domain #================================================= # ADD USER TO THE SSL-CERT GROUP diff --git a/scripts/upgrade b/scripts/upgrade index 53c1ec2..c8c0ea7 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -39,6 +39,8 @@ fi #================================================= server_name=$(ynh_app_setting_get --app=$app --key=server_name) +domain=$(ynh_app_setting_get --app=$app --key=domain) + registration_disabled=$(ynh_app_setting_get --app=$app --key=registration_disabled) disable_federation=$(ynh_app_setting_get --app=$app --key=disable_federation) guests_disabled=$(ynh_app_setting_get --app=$app --key=guests_disabled) @@ -51,7 +53,6 @@ enable_registration_captcha=$(ynh_app_setting_get --app=$app --key=enable_regist # MIGRATION : Manage old settings #================================================= -domain=$(ynh_app_setting_get --app=$app --key=domain) # Define $server_name if not already defined if [ -z $server_name ]; then