From 532a4cafb59a1aef17614eddf4f9bd304c57f085 Mon Sep 17 00:00:00 2001 From: Julien DAUPHANT <1238254+jdauphant@users.noreply.github.com> Date: Mon, 11 Jul 2022 16:40:14 +0200 Subject: [PATCH 1/5] Fix presence in Dev --- config.dev.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/config.dev.json b/config.dev.json index c2d535bab4..d6349e8562 100644 --- a/config.dev.json +++ b/config.dev.json @@ -48,7 +48,10 @@ }, "enable_presence_by_hs_url": { "https://matrix.org": false, - "https://matrix-client.matrix.org": false + "https://matrix-client.matrix.org": false, + "agent1.tchap.incubateur.net": false, + "agent2.tchap.incubateur.net": false, + "externe.tchap.incubateur.net": false }, "settingDefaults": { "breadcrumbs": true, From 1b0895291647bd8b62d5ce3697bbb0e80035dc7f Mon Sep 17 00:00:00 2001 From: Julien DAUPHANT <1238254+jdauphant@users.noreply.github.com> Date: Mon, 11 Jul 2022 16:42:12 +0200 Subject: [PATCH 2/5] Update config.dev.json --- config.dev.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config.dev.json b/config.dev.json index d6349e8562..d50716c9e5 100644 --- a/config.dev.json +++ b/config.dev.json @@ -49,9 +49,9 @@ "enable_presence_by_hs_url": { "https://matrix.org": false, "https://matrix-client.matrix.org": false, - "agent1.tchap.incubateur.net": false, - "agent2.tchap.incubateur.net": false, - "externe.tchap.incubateur.net": false + "https://agent1.tchap.incubateur.net": false, + "https://agent2.tchap.incubateur.net": false, + "https://externe.tchap.incubateur.net": false }, "settingDefaults": { "breadcrumbs": true, From 04568f4be9e903939feba64bd951e6ec0c92f382 Mon Sep 17 00:00:00 2001 From: Julien DAUPHANT <1238254+jdauphant@users.noreply.github.com> Date: Mon, 11 Jul 2022 18:10:30 +0200 Subject: [PATCH 3/5] Update config.dev.json --- config.dev.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config.dev.json b/config.dev.json index d50716c9e5..39378ce0c7 100644 --- a/config.dev.json +++ b/config.dev.json @@ -49,9 +49,9 @@ "enable_presence_by_hs_url": { "https://matrix.org": false, "https://matrix-client.matrix.org": false, - "https://agent1.tchap.incubateur.net": false, - "https://agent2.tchap.incubateur.net": false, - "https://externe.tchap.incubateur.net": false + "https://matrix.agent1.tchap.incubateur.net": false, + "https://matrix.agent2.tchap.incubateur.net": false, + "https://matrix.externe.tchap.incubateur.net": false }, "settingDefaults": { "breadcrumbs": true, From 1876d36233e57d125375c5eaa7c939f137afd9ca Mon Sep 17 00:00:00 2001 From: Julien DAUPHANT <1238254+jdauphant@users.noreply.github.com> Date: Mon, 11 Jul 2022 18:28:54 +0200 Subject: [PATCH 4/5] Update config.dev.json --- config.dev.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/config.dev.json b/config.dev.json index 39378ce0c7..8dfedd8491 100644 --- a/config.dev.json +++ b/config.dev.json @@ -47,8 +47,6 @@ ] }, "enable_presence_by_hs_url": { - "https://matrix.org": false, - "https://matrix-client.matrix.org": false, "https://matrix.agent1.tchap.incubateur.net": false, "https://matrix.agent2.tchap.incubateur.net": false, "https://matrix.externe.tchap.incubateur.net": false From 260cb5c05f4ddd3117240deb2330a37f26756e45 Mon Sep 17 00:00:00 2001 From: Julien DAUPHANT <1238254+jdauphant@users.noreply.github.com> Date: Mon, 11 Jul 2022 19:29:35 +0200 Subject: [PATCH 5/5] Setup for all env --- config.preprod.json | 4 ++-- config.prod.json | 18 ++++++++++++++++-- config.sample.json | 4 ++-- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/config.preprod.json b/config.preprod.json index a0e592f805..dd10f0ec68 100644 --- a/config.preprod.json +++ b/config.preprod.json @@ -41,8 +41,8 @@ ] }, "enable_presence_by_hs_url": { - "https://matrix.org": false, - "https://matrix-client.matrix.org": false + "https://matrix.i.tchap.gouv.fr": false, + "https://matrix.e.tchap.gouv.fr": false }, "settingDefaults": { "breadcrumbs": true, diff --git a/config.prod.json b/config.prod.json index 983eabaf42..d6fee3db4c 100644 --- a/config.prod.json +++ b/config.prod.json @@ -125,8 +125,22 @@ ] }, "enable_presence_by_hs_url": { - "https://matrix.org": false, - "https://matrix-client.matrix.org": false + "https://agent.tchap.gouv.fr": false, + "https://agent.agriculture.tchap.gouv.fr": false, + "https://agent.culture.tchap.gouv.fr": false, + "https://agent.dev-durable.tchap.gouv.fr": false, + "https://agent.diplomatie.tchap.gouv.fr": false, + "https://agent.dinum.tchap.gouv.fr": false, + "https://agent.education.tchap.gouv.fr": false, + "https://agent.elysee.tchap.gouv.fr": false, + "https://agent.externe.tchap.gouv.fr": false, + "https://agent.finances.tchap.gouv.fr": false, + "https://agent.interieur.tchap.gouv.fr": false, + "https://agent.intradef.tchap.gouv.fr": false, + "https://agent.justice.tchap.gouv.fr": false, + "https://agent.pm.tchap.gouv.fr": false, + "https://agent.social.tchap.gouv.fr": false, + "https://agent.ssi.tchap.gouv.fr": false }, "settingDefaults": { "breadcrumbs": true, diff --git a/config.sample.json b/config.sample.json index 4ca65a7f93..8b0d0e8d65 100644 --- a/config.sample.json +++ b/config.sample.json @@ -47,8 +47,8 @@ ] }, "enable_presence_by_hs_url": { - "https://matrix.org": false, - "https://matrix-client.matrix.org": false + "https://matrix.i.tchap.gouv.fr": false, + "https://matrix.e.tchap.gouv.fr": false }, "setting_defaults": { "breadcrumbs": true,