From 38e3ffa29c958ebd02d8180476f10d914fef19df Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Mon, 17 Sep 2018 08:43:54 +0300 Subject: [PATCH] Rename variable (matrix_riot_web_default_identity_server_url -> matrix_identity_server_url) --- CHANGELOG.md | 1 + roles/matrix-server/defaults/main.yml | 3 ++- roles/matrix-server/templates/riot-web/config.json.j2 | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2681ef78..0d6a622e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ The following playbook variables were renamed: - from `matrix_nginx_riot_web_data_path` to `matrix_riot_web_data_path` +- from `matrix_riot_web_default_identity_server_url` to `matrix_identity_server_url` # 2018-09-07 diff --git a/roles/matrix-server/defaults/main.yml b/roles/matrix-server/defaults/main.yml index 9268f39a..dc4371e2 100644 --- a/roles/matrix-server/defaults/main.yml +++ b/roles/matrix-server/defaults/main.yml @@ -217,7 +217,8 @@ matrix_corporal_debug: false # you may wish to disable this. matrix_riot_web_enabled: true -matrix_riot_web_default_identity_server_url: "https://{{ matrix_synapse_trusted_third_party_id_servers[0] }}" +matrix_homeserver_url: "https://{{ hostname_matrix }}" +matrix_identity_server_url: "https://{{ matrix_synapse_trusted_third_party_id_servers[0] }}" # Matrix mautrix is a Matrix <-> Telegram bridge # Enable telegram bridge diff --git a/roles/matrix-server/templates/riot-web/config.json.j2 b/roles/matrix-server/templates/riot-web/config.json.j2 index abb7f0e1..ffc356dd 100644 --- a/roles/matrix-server/templates/riot-web/config.json.j2 +++ b/roles/matrix-server/templates/riot-web/config.json.j2 @@ -1,6 +1,6 @@ { - "default_hs_url": "https://{{ hostname_matrix }}", - "default_is_url": "{{ matrix_riot_web_default_identity_server_url }}", + "default_hs_url": "{{ matrix_homeserver_url }}", + "default_is_url": "{{ matrix_identity_server_url }}", "disable_custom_urls": true, "disable_guests": false, "brand": "Riot",