From a6eb228585fccf217189e791f854d3f8d9d98581 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Sat, 14 Dec 2019 15:11:33 +0100 Subject: [PATCH] Replace special_domain and special_path by domain and path --- actions.toml | 2 +- scripts/backup | 2 +- scripts/config | 2 +- scripts/install | 9 +++------ scripts/remove | 2 +- scripts/restore | 4 ++-- scripts/upgrade | 19 +++++++++++++++++-- 7 files changed, 26 insertions(+), 14 deletions(-) diff --git a/actions.toml b/actions.toml index 343ca1c..42932d4 100644 --- a/actions.toml +++ b/actions.toml @@ -21,7 +21,7 @@ description = "Close the ports range 49153:49193 with TCP and UDP. (Undo \"Open [set_admin_user] name = "Set a user as admin" -command = "[[ \"$(su --command=\"psql matrix_synapse\" postgres <<< \"UPDATE users SET admin = 1 WHERE name = '@$YNH_ACTION_USERNAME:$(yunohost app setting $YNH_APP_INSTANCE_NAME special_domain)'\")\" == 'UPDATE 1' ]]" +command = "[[ \"$(su --command=\"psql matrix_synapse\" postgres <<< \"UPDATE users SET admin = 1 WHERE name = '@$YNH_ACTION_USERNAME:$(yunohost app setting $YNH_APP_INSTANCE_NAME domain)'\")\" == 'UPDATE 1' ]]" user = "root" accepted_return_codes = [0] description = "Set a synapse user as admin in the synapse server. It probably usefull only to manage the community function." diff --git a/scripts/backup b/scripts/backup index 2f181ef..d63121e 100644 --- a/scripts/backup +++ b/scripts/backup @@ -24,7 +24,7 @@ ynh_script_progression --message="Loading installation settings..." --weight=2 app=$YNH_APP_INSTANCE_NAME -domain=$(ynh_app_setting_get --app=$app --key=special_domain) +domain=$(ynh_app_setting_get --app=$app --key=domain) server_name=$(ynh_app_setting_get --app=$app --key=server_name) final_path=$(ynh_app_setting_get --app=$app --key=final_path) diff --git a/scripts/config b/scripts/config index e50f3a2..f7ceb4a 100644 --- a/scripts/config +++ b/scripts/config @@ -70,7 +70,7 @@ apply_config() { ynh_app_setting_set --app $app --key disable_backup_before_upgrade --value 1 fi - domain=$(ynh_app_setting_get --app $app --key special_domain) + domain=$(ynh_app_setting_get --app $app --key domain) server_name=$(ynh_app_setting_get --app $app --key server_name) synapse_db_pwd=$(ynh_app_setting_get --app $app --key synapse_db_pwd) is_public=$(ynh_app_setting_get --app $app --key is_public) diff --git a/scripts/install b/scripts/install index 7144079..6550690 100644 --- a/scripts/install +++ b/scripts/install @@ -72,12 +72,9 @@ test ! -e "$final_path" || ynh_die --message="This path already contains a folde #================================================= ynh_script_progression --message="Storing installation settings..." --weight=1 -# For the domain and the path we can't use the standard keys "domain" and "path" with the standard function ynh_webpath_register because it create automatically a button on the user pannel. -# The idea is to create a custom key (specia_domain and special_path instead of domain and key). -# By this the ssowatconf fonction don't create a button on the pannel. -# This hack solve the issue : https://github.com/YunoHost-Apps/synapse_ynh/issues/14 -ynh_app_setting_set --app=$app --key=special_domain --value=$domain -ynh_app_setting_set --app=$app --key=special_path --value=$path_url +ynh_app_setting_set --app=$app --key=domain --value=$domain +ynh_app_setting_set --app=$app --key=path --value=$path_url +ynh_app_setting_set --app=$app --key=no_sso --value true ynh_app_setting_set --app=$app --key=server_name --value=$server_name ynh_app_setting_set --app=$app --key=final_path --value=$final_path ynh_app_setting_set --app=$app --key=synapse_version --value=$upstream_version diff --git a/scripts/remove b/scripts/remove index a7d5f55..605838d 100755 --- a/scripts/remove +++ b/scripts/remove @@ -17,7 +17,7 @@ ynh_script_progression --message="Loading installation settings..." --weight=3 app=$YNH_APP_INSTANCE_NAME -domain=$(ynh_app_setting_get --app=$app --key=special_domain) +domain=$(ynh_app_setting_get --app=$app --key=domain) server_name=$(ynh_app_setting_get --app=$app --key=server_name) final_path=$(ynh_app_setting_get --app=$app --key=final_path) synapse_tls_port=$(ynh_app_setting_get --app=$app --key=synapse_tls_port) diff --git a/scripts/restore b/scripts/restore index 7073f1c..0cf641f 100644 --- a/scripts/restore +++ b/scripts/restore @@ -29,9 +29,9 @@ ynh_script_progression --message="Loading settings..." app=$YNH_APP_INSTANCE_NAME -domain=$(ynh_app_setting_get --app=$app --key=special_domain) +domain=$(ynh_app_setting_get --app=$app --key=domain) server_name=$(ynh_app_setting_get --app=$app --key=server_name) -path_url=$(ynh_app_setting_get --app=$app --key=special_path) +path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) synapse_tls_port=$(ynh_app_setting_get --app=$app --key=synapse_tls_port) turnserver_tls_port=$(ynh_app_setting_get --app=$app --key=turnserver_tls_port) diff --git a/scripts/upgrade b/scripts/upgrade index c134a1e..0174af2 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -17,9 +17,9 @@ ynh_script_progression --message="Loading installation settings..." --weight=3 app=$YNH_APP_INSTANCE_NAME -domain=$(ynh_app_setting_get --app=$app --key=special_domain) +domain=$(ynh_app_setting_get --app=$app --key=domain) server_name=$(ynh_app_setting_get --app=$app --key=server_name) -path_url=$(ynh_app_setting_get --app=$app --key=special_path) +path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) synapse_old_version=$(ynh_app_setting_get --app=$app --key=synapse_version) is_public=$(ynh_app_setting_get --app=$app --key=is_public) @@ -92,6 +92,21 @@ ynh_abort_if_errors #================================================= # STANDARD UPGRADE STEPS +#================================================= +# MIGRATION 5 : GENERATE SYNAPSE SECRET +#================================================= + +# Migrate from settings 'special_domain' to 'domain' and 'special_path' to 'path' +if [ -z $domain ]; then + domain=$(ynh_app_setting_get --app=$app --key=special_domain) + path_url=$(ynh_app_setting_get --app=$app --key=special_path) + ynh_app_setting_set --app=$app --key=domain --value=$domain + ynh_app_setting_set --app=$app --key=path --value=$path_url + ynh_app_setting_delete -app=$app --key=special_domain + ynh_app_setting_delete -app=$app --key=special_path + ynh_app_setting_set --app=$app --key=no_sso --value true +fi + #================================================= # INSTALL DEPENDENCIES #=================================================