From e41631fec6bfdab20ea09baf5fc94e09db66caf4 Mon Sep 17 00:00:00 2001 From: Stefan Matting Date: Thu, 17 Dec 2020 15:06:06 +0100 Subject: [PATCH 1/4] Add spar to the integration tests for brig (#397) --- charts/brig/templates/tests/configmap.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/charts/brig/templates/tests/configmap.yaml b/charts/brig/templates/tests/configmap.yaml index 4c72812f4..6a711dec8 100644 --- a/charts/brig/templates/tests/configmap.yaml +++ b/charts/brig/templates/tests/configmap.yaml @@ -22,6 +22,10 @@ data: host: cargohold port: 8080 + spar: + host: spar + port: 8080 + nginz: # Full URL is set so that there can be a common cookiedomain between nginz and brig # needed by some integration tests From 50e4bbc35a16c87e598100e1c347a41ec7b74c73 Mon Sep 17 00:00:00 2001 From: Lucendio Date: Fri, 18 Dec 2020 00:23:34 +0100 Subject: [PATCH 2/4] [helm] Remove duplicate fields from brig section in the example value files (#398) --- values/wire-server/demo-values.example.yaml | 7 +++---- values/wire-server/prod-values.example.yaml | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/values/wire-server/demo-values.example.yaml b/values/wire-server/demo-values.example.yaml index 4fe670a86..a2976fb0d 100644 --- a/values/wire-server/demo-values.example.yaml +++ b/values/wire-server/demo-values.example.yaml @@ -41,14 +41,13 @@ brig: teamMemberWelcome: https://wire.example.com/download # change this optSettings: setFederationDomain: example.com # change this + # Sync the domain with the 'host' variable in the sftd chart + # uncomment this section if conference calling is not used + setSftStaticUrl: "https://sftd.example.om:443" emailSMS: general: emailSender: email@example.com # change this smsSender: "insert-sms-sender-for-twilio" # change this if SMS support is desired - optSettings: - # Sync the domain with the 'host' variable in the sftd chart - # uncomment this section if conference calling is not used - setSftStaticUrl: "https://sftd.example.om:443" smtp: host: demo-smtp # change this if you want to use your own SMTP server port: 25 # change this diff --git a/values/wire-server/prod-values.example.yaml b/values/wire-server/prod-values.example.yaml index 1e12f737b..9344ad92c 100644 --- a/values/wire-server/prod-values.example.yaml +++ b/values/wire-server/prod-values.example.yaml @@ -42,6 +42,9 @@ brig: teamMemberWelcome: https://wire.example.com/download # change this optSettings: setFederationDomain: example.com # change this + # Sync the domain with the 'host' variable in the sftd chart + # uncomment this section if conference calling is not used + setSftStaticUrl: "https://sftd.example.om:443" emailSMS: general: emailSender: email@example.com # change this @@ -74,10 +77,6 @@ brig: # noProxyList: # - "local.example.com" # - "10.23.0.0/16" - optSettings: - # Sync the domain with the 'host' variable in the sftd chart - # uncomment this section if conference calling is not used - setSftStaticUrl: "https://sftd.example.om:443" turnStatic: v1: - "turn:turn01.example.com:80" From 3e4420377fe8dd02aa44e445d175250d31b4e549 Mon Sep 17 00:00:00 2001 From: Stefan Matting Date: Fri, 18 Dec 2020 14:42:35 +0100 Subject: [PATCH 3/4] brig: Add setExpiredUserCleanupTimeout to configmap (#399) --- charts/brig/templates/configmap.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/charts/brig/templates/configmap.yaml b/charts/brig/templates/configmap.yaml index 2f11716a3..f11b177b2 100644 --- a/charts/brig/templates/configmap.yaml +++ b/charts/brig/templates/configmap.yaml @@ -167,6 +167,9 @@ data: optSettings: setActivationTimeout: {{ .setActivationTimeout }} setTeamInvitationTimeout: {{ .setTeamInvitationTimeout }} + {{- if .setExpiredUserCleanupTimeout }} + setExpiredUserCleanupTimeout: {{ .setExpiredUserCleanupTimeout }} + {{- end }} setTwilio: /etc/wire/brig/secrets/twilio-credentials.yaml setNexmo: /etc/wire/brig/secrets/nexmo-credentials.yaml setUserMaxConnections: {{ .setUserMaxConnections }} From f786033a6c6033d37c084c118748566a408f361a Mon Sep 17 00:00:00 2001 From: Matthias Fischmann Date: Mon, 21 Dec 2020 16:44:53 +0100 Subject: [PATCH 4/4] CHANGELOG --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 96bc0441e..407c6b403 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# 2020-12-21 + +* brig: Add setExpiredUserCleanupTimeout to configmap (#399) see also: https://github.com/wireapp/wire-server/pull/1264 +* [helm] Remove duplicate fields from brig section in the example value files (#398) +* Add spar to the integration tests for brig (#397) + # 2020-12-17 ## Update instructions