Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Release 2020/12/21 #400

Merged
merged 6 commits into from
Dec 22, 2020
Merged

Release 2020/12/21 #400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
13c8999
Merge branch 'master' into develop
arianvp Dec 17, 2020
1d0a821
Merge branch 'master' into develop
arianvp Dec 17, 2020
e41631f
Add spar to the integration tests for brig (#397)
smatting Dec 17, 2020
50e4bbc
[helm] Remove duplicate fields from brig section in the example value…
lucendio Dec 17, 2020
3e44203
brig: Add setExpiredUserCleanupTimeout to configmap (#399)
smatting Dec 18, 2020
f786033
CHANGELOG
fisx Dec 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 3 additions & 0 deletions charts/brig/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 4 additions & 0 deletions charts/brig/templates/tests/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 3 additions & 4 deletions values/wire-server/demo-values.example.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 3 additions & 4 deletions values/wire-server/prod-values.example.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down