From 2c0266f6bf102b7e44da4295ed72a82f470e5de9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Fri, 24 Jun 2022 13:10:12 +0200 Subject: [PATCH 1/2] Fix email configuration --- conf/homeserver.yaml | 2 +- scripts/change_url | 1 + scripts/config | 1 + scripts/install | 1 + scripts/restore | 1 + scripts/upgrade | 1 + 6 files changed, 6 insertions(+), 1 deletion(-) diff --git a/conf/homeserver.yaml b/conf/homeserver.yaml index c074c59..f073e4e 100644 --- a/conf/homeserver.yaml +++ b/conf/homeserver.yaml @@ -2260,7 +2260,7 @@ password_providers: email: # The hostname of the outgoing SMTP server to use. Defaults to 'localhost'. # - smtp_host: "localhost" + smtp_host: "__MAIN_DOMAIN__" # The port on the mail server for outgoing SMTP. Defaults to 25. # diff --git a/scripts/change_url b/scripts/change_url index 18bb168..fa8668e 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -41,6 +41,7 @@ registration_shared_secret=$(ynh_app_setting_get --app=$app --key=registration_s form_secret=$(ynh_app_setting_get --app=$app --key=form_secret) macaroon_secret_key=$(ynh_app_setting_get --app=$app --key=macaroon_secret_key) synapse_user_app_pwd=$(ynh_app_setting_get --app=$app --key=synapse_user_app_pwd) +main_domain=$(yunohost domain list --output-as json | jq -r .main) synapse_user="matrix-$app" synapse_user_app="$app" diff --git a/scripts/config b/scripts/config index 3163337..ec3f646 100644 --- a/scripts/config +++ b/scripts/config @@ -28,6 +28,7 @@ jitsi_server=$(ynh_app_setting_get --app=$app --key=jitsi_server) e2e_enabled_by_default=$(ynh_app_setting_get --app=$app --key=e2e_enabled_by_default) synapse_user_app_pwd=$(ynh_app_setting_get --app=$app --key=synapse_user_app_pwd) domain_whitelist_client=$(get_domain_list) +main_domain=$(yunohost domain list --output-as json | jq -r .main) #================================================= # SHOW_CONFIG FUNCTION FOR 'SHOW' COMMAND diff --git a/scripts/install b/scripts/install index 674efb9..29311e2 100644 --- a/scripts/install +++ b/scripts/install @@ -50,6 +50,7 @@ path_url="/_matrix" final_path="/opt/yunohost/matrix-$app" final_www_path="/var/www/$app" data_path="/home/yunohost.app/matrix-$app" +main_domain=$(yunohost domain list --output-as json | jq -r .main) if [[ "$server_name" == "$default_domain_value" ]]; then server_name=$domain diff --git a/scripts/restore b/scripts/restore index fbd5353..347c02e 100644 --- a/scripts/restore +++ b/scripts/restore @@ -39,6 +39,7 @@ turnserver_alt_tls_port=$(ynh_app_setting_get --app=$app --key=turnserver_alt_tl phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) synapse_db_pwd=$(ynh_app_setting_get --app=$app --key=synapse_db_pwd) synapse_user_app_pwd=$(ynh_app_setting_get --app=$app --key=synapse_user_app_pwd) +main_domain=$(yunohost domain list --output-as json | jq -r .main) #================================================= # SET ALL CONSTANT diff --git a/scripts/upgrade b/scripts/upgrade index 4ad28b2..536ca48 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -42,6 +42,7 @@ form_secret=$(ynh_app_setting_get --app=$app --key=form_secret) macaroon_secret_key=$(ynh_app_setting_get --app=$app --key=macaroon_secret_key) synapse_user_app_pwd=$(ynh_app_setting_get --app=$app --key=synapse_user_app_pwd) domain_whitelist_client=$(get_domain_list) +main_domain=$(yunohost domain list --output-as json | jq -r .main) #================================================= # SET ALL CONSTANT From a01bd4da8d87ba3430285bd13df26aad60b9af71 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 24 Jun 2022 11:11:27 +0000 Subject: [PATCH 2/2] Auto-update README --- README_fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_fr.md b/README_fr.md index eb8bdab..097f2c5 100644 --- a/README_fr.md +++ b/README_fr.md @@ -20,7 +20,7 @@ Instant messaging server matrix network. Yunohost chatroom with matrix : [https://riot.im/app/#/room/#yunohost:matrix.org](https://riot.im/app/#/room/#yunohost:matrix.org) -**Version incluse :** 1.59.1~ynh1 +**Version incluse :** 1.61.0~ynh1 ## Avertissements / informations importantes ## Configuration