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/changelog.d/3-deploy-builds/remove-oboslete-secrets b/changelog.d/3-deploy-builds/remove-oboslete-secrets new file mode 100644 index 000000000..f36e227bb --- /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. 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: