From dc9d0afa1cb9d8caf4e994ca8a48699d3ee9f09b Mon Sep 17 00:00:00 2001 From: sghosh23 Date: Fri, 27 Feb 2026 16:48:29 +0100 Subject: [PATCH 1/3] Remove obsolete secrets from the brig config --- bin/offline-secrets.sh | 7 +------ bin/secrets.sh | 9 +-------- values/wire-server/demo-secrets.example.yaml | 6 ------ values/wire-server/prod-secrets.example.yaml | 6 ------ 4 files changed, 2 insertions(+), 26 deletions(-) diff --git a/bin/offline-secrets.sh b/bin/offline-secrets.sh index c483830bd..76756a1a6 100755 --- a/bin/offline-secrets.sh +++ b/bin/offline-secrets.sh @@ -53,12 +53,7 @@ brig: password: guest # These are only necessary if you wish to support sign up via SMS/calls # And require accounts at twilio.com / nexmo.com - setTwilio: |- - sid: "dummy" - token: "dummy" - setNexmo: |- - key: "dummy" - secret: "dummy" + cargohold: secrets: awsKeyId: "$minio_cargohold_access_key" diff --git a/bin/secrets.sh b/bin/secrets.sh index 06c1dc40b..e7a3e06a3 100755 --- a/bin/secrets.sh +++ b/bin/secrets.sh @@ -104,14 +104,7 @@ brig: # these only need to be changed if using real AWS services awsKeyId: dummykey awsSecretKey: dummysecret - # These are only necessary if you wish to support sign up via SMS/calls - # And require accounts at twilio.com / nexmo.com - setTwilio: |- - sid: dummy - token: dummy - setNexmo: |- - key: dummy - secret: dummy + cargohold: secrets: awsKeyId: dummykey diff --git a/values/wire-server/demo-secrets.example.yaml b/values/wire-server/demo-secrets.example.yaml index 8a47a055d..7bc5ecad3 100644 --- a/values/wire-server/demo-secrets.example.yaml +++ b/values/wire-server/demo-secrets.example.yaml @@ -28,12 +28,6 @@ brig: # To extract the secret from an existing Kubernetes cluster: # kubectl get secret wire-postgresql-secret -n postgresql -o jsonpath='{.data.password}' | base64 -d pgPassword: dummyPassword # gets replaced by the actual secret - setTwilio: |- - sid: "dummy" - token: "dummy" - setNexmo: |- - key: "dummy" - secret: "dummy" elasticsearch: username: "elastic" password: "changeme" diff --git a/values/wire-server/prod-secrets.example.yaml b/values/wire-server/prod-secrets.example.yaml index 30ab8e519..23365c9af 100644 --- a/values/wire-server/prod-secrets.example.yaml +++ b/values/wire-server/prod-secrets.example.yaml @@ -22,12 +22,6 @@ brig: rabbitmq: username: guest password: guest - setTwilio: |- - sid: "dummy" - token: "dummy" - setNexmo: |- - key: "dummy" - secret: "dummy" cannon: secrets: From 22513088376ae26f3a43b287ad0cf2e01fd6fe19 Mon Sep 17 00:00:00 2001 From: sghosh23 Date: Fri, 27 Feb 2026 16:59:47 +0100 Subject: [PATCH 2/3] add the changelog --- changelog.d/3-deploy-builds/remove-oboslete-secrets | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/3-deploy-builds/remove-oboslete-secrets diff --git a/changelog.d/3-deploy-builds/remove-oboslete-secrets b/changelog.d/3-deploy-builds/remove-oboslete-secrets new file mode 100644 index 000000000..ad21ac021 --- /dev/null +++ b/changelog.d/3-deploy-builds/remove-oboslete-secrets @@ -0,0 +1 @@ +Removed: obsolete secrets from scripts and references for improved security and clarity. \ No newline at end of file From 44ce29e7cd44da70319cc9b4d221dcb17f20f1a2 Mon Sep 17 00:00:00 2001 From: sghosh23 Date: Fri, 27 Feb 2026 17:01:57 +0100 Subject: [PATCH 3/3] add the important line --- changelog.d/3-deploy-builds/remove-oboslete-secrets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.d/3-deploy-builds/remove-oboslete-secrets b/changelog.d/3-deploy-builds/remove-oboslete-secrets index ad21ac021..f36e227bb 100644 --- a/changelog.d/3-deploy-builds/remove-oboslete-secrets +++ b/changelog.d/3-deploy-builds/remove-oboslete-secrets @@ -1 +1 @@ -Removed: obsolete secrets from scripts and references for improved security and clarity. \ No newline at end of file +Removed: obsolete secrets from scripts and references for improved security and clarity.