From a49e1a70dbc0545e96f2623d05f353ecbc7146cd Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Thu, 10 Oct 2019 14:20:40 +0100 Subject: [PATCH 1/5] Update default HS config to match well-known We want to move matrix.org client traffic to `https://matrix-client.matrix.org --- riot.im/app/config.json | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/riot.im/app/config.json b/riot.im/app/config.json index 164b81c1ae..dfcf5bd7a7 100644 --- a/riot.im/app/config.json +++ b/riot.im/app/config.json @@ -1,6 +1,13 @@ { - "default_hs_url": "https://matrix.org", - "default_is_url": "https://vector.im", + "default_server_config": { + "m.homeserver": { + "server_name": "matrix.org", + "base_url": "https://matrix-client.matrix.org" + }, + "m.identity_server": { + "base_url": "https://vector.im" + } + }, "brand": "Riot", "integrations_ui_url": "https://scalar.vector.im/", "integrations_rest_url": "https://scalar.vector.im/api", From 19e0848698b6b7faf768ed8a8dc404a7566993e9 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Thu, 10 Oct 2019 14:21:37 +0100 Subject: [PATCH 2/5] Update develop config too --- riot.im/develop/config.json | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/riot.im/develop/config.json b/riot.im/develop/config.json index a1f0b35b75..18c79e2ec2 100644 --- a/riot.im/develop/config.json +++ b/riot.im/develop/config.json @@ -1,6 +1,13 @@ { - "default_hs_url": "https://matrix.org", - "default_is_url": "https://vector.im", + "default_server_config": { + "m.homeserver": { + "server_name": "matrix.org", + "base_url": "https://matrix-client.matrix.org" + }, + "m.identity_server": { + "base_url": "https://vector.im" + } + }, "brand": "Riot", "integrations_ui_url": "https://scalar-staging.vector.im/", "integrations_rest_url": "https://scalar-staging.vector.im/api", From 0533e559aed768d37bb38e7d4a9bf0eed8d55634 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Thu, 10 Oct 2019 14:35:10 +0100 Subject: [PATCH 3/5] Update config.json --- riot.im/app/config.json | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/riot.im/app/config.json b/riot.im/app/config.json index dfcf5bd7a7..70ecddfdac 100644 --- a/riot.im/app/config.json +++ b/riot.im/app/config.json @@ -1,13 +1,5 @@ { - "default_server_config": { - "m.homeserver": { - "server_name": "matrix.org", - "base_url": "https://matrix-client.matrix.org" - }, - "m.identity_server": { - "base_url": "https://vector.im" - } - }, + "default_server_name": "matrix.org", "brand": "Riot", "integrations_ui_url": "https://scalar.vector.im/", "integrations_rest_url": "https://scalar.vector.im/api", From 76ce2504212bd7ea54f7df1f2eb2215c762e421c Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Thu, 10 Oct 2019 14:35:56 +0100 Subject: [PATCH 4/5] Update config.json --- riot.im/develop/config.json | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/riot.im/develop/config.json b/riot.im/develop/config.json index 18c79e2ec2..f028ab970e 100644 --- a/riot.im/develop/config.json +++ b/riot.im/develop/config.json @@ -1,13 +1,5 @@ { - "default_server_config": { - "m.homeserver": { - "server_name": "matrix.org", - "base_url": "https://matrix-client.matrix.org" - }, - "m.identity_server": { - "base_url": "https://vector.im" - } - }, + "default_server_name": "matrix.org", "brand": "Riot", "integrations_ui_url": "https://scalar-staging.vector.im/", "integrations_rest_url": "https://scalar-staging.vector.im/api", From 82286d45edb6d8207f12a37ef08ba43a9b914569 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Thu, 10 Oct 2019 15:50:19 +0100 Subject: [PATCH 5/5] Update config.json --- electron_app/riot.im/config.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/electron_app/riot.im/config.json b/electron_app/riot.im/config.json index a2df3da047..9887e025bc 100644 --- a/electron_app/riot.im/config.json +++ b/electron_app/riot.im/config.json @@ -1,7 +1,6 @@ { "update_base_url": "https://packages.riot.im/desktop/update/", - "default_hs_url": "https://matrix.org", - "default_is_url": "https://vector.im", + "default_server_name": "matrix.org", "brand": "Riot", "integrations_ui_url": "https://scalar.vector.im/", "integrations_rest_url": "https://scalar.vector.im/api",