Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .envrc
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ if [[ "$NO_GIT_HOOKS" == "TRUE" ]]; then
echo ""
echo " Git Hooks has been configured in your current environment."
echo " Read more about them here: https://github.com/wireapp/wire-server-deploy?tab=readme-ov-file#optional-git-commit-message-verification"
echo " If you don't want to use it, then set NO_GIT_HOOKS=FALSE in file .envrc.local and re-laod the envionment by running:"
echo " If you don't want to use it, then set NO_GIT_HOOKS=FALSE in file .envrc.local and re-load the envionment by running:"
echo " direnv reload"
echo ""
else
else
git config --unset core.hooksPath
fi
2 changes: 1 addition & 1 deletion .git-hooks/commit-msg
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ if ! echo "$commit_message" | grep -E "$pattern" | grep -E "$pattern2"; then
echo " test: add unit tests wpb-1234"
echo " chore!: WPB-1234 drop support for k8s 1.16 - add a 'BREAKING CHANGE:' statement"
echo " Read more about it here: https://www.conventionalcommits.org/en/v1.0.0/"
echo " If you don't want to use it, then set NO_GIT_HOOKS=FALSE in file .envrc.local and re-laod the envionment by running:"
echo " If you don't want to use it, then set NO_GIT_HOOKS=FALSE in file .envrc.local and re-load the envionment by running:"
echo " direnv reload"
exit 1
fi
1 change: 1 addition & 0 deletions changelog.d/3-deploy-builds/wire-server-5.27
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Added: update prod and demo example values/secrets for wire-server 5.27, aligning PostgreSQL config, postgresMigration (conversation, teamFeatures), rabbitmq, and mlsPrivateKeys across all services
2 changes: 1 addition & 1 deletion offline/tasks/proc_pull_charts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -94,5 +94,5 @@ pull_charts() {
#fi
}

wire_build="https://raw.githubusercontent.com/wireapp/wire-builds/pinned-offline-multi-20260224-142104/build.json"
wire_build="https://raw.githubusercontent.com/wireapp/wire-builds/ecd204f07540e79fc1febe2483a42111129a5d0d/build.json"
wire_build_chart_release "$wire_build" | pull_charts
4 changes: 2 additions & 2 deletions values/wire-server/demo-secrets.example.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ galley:
# mls_ed25519_key="$(generate_mls_key -algorithm ed25519)"
# mls_ecdsa_p256_key="$(generate_mls_key -algorithm ec -pkeyopt ec_paramgen_curve:P-256)"
# mls_ecdsa_p384_key="$(generate_mls_key -algorithm ec -pkeyopt ec_paramgen_curve:P-384)"
# mls_ecdsa_p521_key="$(generate_mls_key -algorithm ec -pkeyopt ec_paramgen_curve:P-521)"
# mls_ecdsa_p521_key="$(generate_mls_key -algorithm ec -pkeyopt ec_paramgen_curve:P-521)"

# this will get initialized from wire_secrets.yml playbook or can be generated using above logic
# mlsPrivateKeys:
Expand Down Expand Up @@ -121,7 +121,7 @@ nginz:
basicAuth: "<username>:<htpasswd-hashed-password>"


# RabbitMQ credentials for background-worker.
# RabbitMQ and PostgreSQL credentials for background-worker.
background-worker:
secrets:
pgPassword: verysecurepassword
Expand Down
23 changes: 17 additions & 6 deletions values/wire-server/demo-values.example.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ brig:
port: "5432"
user: wire-server
dbname: wire-server
# See pool size calculation guide: https://docs.wire.com/latest/how-to/administrate/postgresql.html
postgresqlPool:
size: 10 # adjust pool size as needed based on expected load and available resources
useSES: false
# Set to false if you want to hand out DynamoDB to store prekeys
randomPrekeys: true
Expand Down Expand Up @@ -183,10 +186,15 @@ galley:
port: "5432"
user: wire-server
dbname: wire-server
# See pool size calculation guide: https://docs.wire.com/latest/how-to/administrate/postgresql.html
postgresqlPool:
size: 10 # adjust pool size as needed based on expected load and available resources
# Explicitly set postgresMigration to cassandra for fresh deployments.
# This controls whether galley reads conversations from Cassandra or PostgreSQL.
# This controls whether galley reads conversations/teamFeatures from Cassandra or PostgreSQL.
postgresMigration:
conversation: cassandra
conversationCodes: cassandra
teamFeatures: cassandra
enableFederation: false # Enable to use federation
settings:
# prefix URI used when inviting users to a conversation by link
Expand Down Expand Up @@ -366,13 +374,16 @@ background-worker:
port: "5432"
user: wire-server
dbname: wire-server
# IMPORTANT: At Chart 5.25.0, the background-worker Helm chart incorrectly defaults
# postgresMigration.conversation to "postgresql" instead of "cassandra".
# This MUST be explicitly set to "cassandra" unless you have already migrated
# conversations to PostgreSQL. Without this override, User Group to Channel sync
# jobs will silently skip member synchronization.
# See pool size calculation guide: https://docs.wire.com/latest/how-to/administrate/postgresql.html
postgresqlPool:
size: 5 # Background worker has fewer connections to DB, so smaller pool size is fine
postgresMigration:
conversation: cassandra
conversationCodes: cassandra
teamFeatures: cassandra
migrateConversations: false
migrateConversationCodes: false
migrateTeamFeatures: false
# Enable for federation
enableFederation: false
metrics:
Expand Down
25 changes: 18 additions & 7 deletions values/wire-server/prod-values.example.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ brig:
port: "5432"
user: wire-server
dbname: wire-server
# See pool size calculation guide: https://docs.wire.com/latest/how-to/administrate/postgresql.html
postgresqlPool:
size: 10 # adjust pool size as needed based on expected load and available resources
Comment thread
sghosh23 marked this conversation as resolved.
useSES: false
# Set to false if you want to hand out DynamoDB to store prekeys
randomPrekeys: true
Expand All @@ -56,7 +59,7 @@ brig:
enableFederation: false # Keep false unless federation is explicitly configured
optSettings:
setEnableMLS: false # Enable for MLS protocol use
setFederationDomain: example.com # change this per host deployment
setFederationDomain: example.com # change this
# Sync the domain with the 'host' variable in the sftd chart
# Comment the next line (by adding '#' before it) if conference calling is not used
setSftStaticUrl: "https://sftd.example.com:443"
Expand Down Expand Up @@ -183,10 +186,15 @@ galley:
port: "5432"
user: wire-server
dbname: wire-server
# See pool size calculation guide: https://docs.wire.com/latest/how-to/administrate/postgresql.html
postgresqlPool:
size: 10 # adjust pool size as needed based on expected load and available resources
# Explicitly set postgresMigration to cassandra for fresh deployments.
# This controls whether galley reads conversations from Cassandra or PostgreSQL.
# This controls whether galley reads conversations/teamFeatures from Cassandra or PostgreSQL.
postgresMigration:
conversation: cassandra
conversationCodes: cassandra
teamFeatures: cassandra
enableFederation: false # Enable to use federation
settings:
# prefix URI used when inviting users to a conversation by link
Expand Down Expand Up @@ -366,13 +374,16 @@ background-worker:
port: "5432"
user: wire-server
dbname: wire-server
# IMPORTANT: At Chart 5.25.0, the background-worker Helm chart incorrectly defaults
# postgresMigration.conversation to "postgresql" instead of "cassandra".
# This MUST be explicitly set to "cassandra" unless you have already migrated
# conversations to PostgreSQL. Without this override, User Group to Channel sync
# jobs will silently skip member synchronization.
# See pool size calculation guide: https://docs.wire.com/latest/how-to/administrate/postgresql.html
postgresqlPool:
size: 5 # Background worker has fewer connections to DB, so smaller pool size is fine
Comment thread
sghosh23 marked this conversation as resolved.
postgresMigration:
conversation: cassandra
conversationCodes: cassandra
teamFeatures: cassandra
migrateConversations: false
migrateConversationCodes: false
migrateTeamFeatures: false
# Enable for federation
enableFederation: false
metrics:
Expand Down
Loading