Skip to content

Commit 129e884

Browse files
authored
Merge pull request #874 from wireapp/remove-oboslete-secrets
Remove obsolete secrets from the brig config
2 parents e32dbd2 + 44ce29e commit 129e884

File tree

5 files changed

+3
-26
lines changed

5 files changed

+3
-26
lines changed

bin/offline-secrets.sh

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,7 @@ brig:
5353
password: guest
5454
# These are only necessary if you wish to support sign up via SMS/calls
5555
# And require accounts at twilio.com / nexmo.com
56-
setTwilio: |-
57-
sid: "dummy"
58-
token: "dummy"
59-
setNexmo: |-
60-
key: "dummy"
61-
secret: "dummy"
56+
6257
cargohold:
6358
secrets:
6459
awsKeyId: "$minio_cargohold_access_key"

bin/secrets.sh

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,7 @@ brig:
104104
# these only need to be changed if using real AWS services
105105
awsKeyId: dummykey
106106
awsSecretKey: dummysecret
107-
# These are only necessary if you wish to support sign up via SMS/calls
108-
# And require accounts at twilio.com / nexmo.com
109-
setTwilio: |-
110-
sid: dummy
111-
token: dummy
112-
setNexmo: |-
113-
key: dummy
114-
secret: dummy
107+
115108
cargohold:
116109
secrets:
117110
awsKeyId: dummykey
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Removed: obsolete secrets from scripts and references for improved security and clarity.

values/wire-server/demo-secrets.example.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,6 @@ brig:
2828
# To extract the secret from an existing Kubernetes cluster:
2929
# kubectl get secret wire-postgresql-secret -n postgresql -o jsonpath='{.data.password}' | base64 -d
3030
pgPassword: dummyPassword # gets replaced by the actual secret
31-
setTwilio: |-
32-
sid: "dummy"
33-
token: "dummy"
34-
setNexmo: |-
35-
key: "dummy"
36-
secret: "dummy"
3731
elasticsearch:
3832
username: "elastic"
3933
password: "changeme"

values/wire-server/prod-secrets.example.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,6 @@ brig:
2222
rabbitmq:
2323
username: guest
2424
password: guest
25-
setTwilio: |-
26-
sid: "dummy"
27-
token: "dummy"
28-
setNexmo: |-
29-
key: "dummy"
30-
secret: "dummy"
3125

3226
cannon:
3327
secrets:

0 commit comments

Comments
 (0)