nomad/matrix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update rendered example

Browse Source
This commit is contained in:
Daniel Berteaud 2024-03-05 14:58:48 +01:00
parent 184889b74f
commit c01f0a466f
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example/init/vault-database
View File

@ -2,7 +2,7 @@
set -euo pipefail set -euo pipefail
vault write /database/roles/matrix-synapse \ vault write database/roles/matrix-synapse \
db_name="postgres" \ db_name="postgres" \
creation_statements="CREATE ROLE \"{{name}}\" WITH LOGIN PASSWORD '{{password}}' VALID UNTIL '{{expiration}}'; \ creation_statements="CREATE ROLE \"{{name}}\" WITH LOGIN PASSWORD '{{password}}' VALID UNTIL '{{expiration}}'; \
GRANT \"matrix-synapse\" TO \"{{name}}\"; \ GRANT \"matrix-synapse\" TO \"{{name}}\"; \

10
example/matrix.nomad.hcl
View File

@ -95,7 +95,7 @@ job "matrix" {
user = 1053 user = 1053
config { config {
image = "danielberteaud/wait-for:24.2-1" image = "danielberteaud/wait-for:24.3-1"
readonly_rootfs = true readonly_rootfs = true
pids_limit = 20 pids_limit = 20
} }
@ -170,9 +170,9 @@ database:
args: args:
database: matrix-synapse database: matrix-synapse
host: 127.0.0.1 host: 127.0.0.1
password: '{{ with secret "/database/creds/matrix-synapse" }}{{ .Data.password }}{{ end }}' password: '{{ with secret "database/creds/matrix-synapse" }}{{ .Data.password }}{{ end }}'
port: "5432" port: "5432"
user: '{{ with secret "/database/creds/matrix-synapse" }}{{ .Data.username }}{{ end }}' user: '{{ with secret "database/creds/matrix-synapse" }}{{ .Data.username }}{{ end }}'
name: psycopg2 name: psycopg2
default_identity_server: https://matrix.org default_identity_server: https://matrix.org
delete_stale_devices_after: 180d delete_stale_devices_after: 180d
@ -185,7 +185,7 @@ email:
smtp_host: 127.0.0.1 smtp_host: 127.0.0.1
smtp_port: 25 smtp_port: 25
forgotten_room_retention_period: 15d forgotten_room_retention_period: 15d
form_secret: '{{- with secret "/kv/service/matrix" }}{{ .Data.data.form_secret }}{{ end }}' form_secret: '{{- with secret "kv/service/matrix" }}{{ .Data.data.form_secret }}{{ end }}'
listeners: listeners:
- path: /alloc/tmp/synapse.sock - path: /alloc/tmp/synapse.sock
resources: resources:
@ -195,7 +195,7 @@ listeners:
- federation - federation
type: http type: http
log_config: /secrets/logging.conf log_config: /secrets/logging.conf
macaroon_secret_key: '{{- with secret "/kv/service/matrix" }}{{ .Data.data.macaroon_secret_key }}{{ end }}' macaroon_secret_key: '{{- with secret "kv/service/matrix" }}{{ .Data.data.macaroon_secret_key }}{{ end }}'
max_avatar_size: 4M max_avatar_size: 4M
media_retention: media_retention:
local_media_lifetime: 730d local_media_lifetime: 730d

2
example/prep.d/20-rand-pwd.sh
View File

@ -5,7 +5,7 @@ set -euo pipefail
# vim: syntax=sh # vim: syntax=sh
export LC_ALL=C export LC_ALL=C
VAULT_KV_PATH=/kv/service/matrix VAULT_KV_PATH=kv/service/matrix
RAND_CMD="tr -dc A-Za-z0-9\-_\/=~\.+ < /dev/urandom | head -c 50" RAND_CMD="tr -dc A-Za-z0-9\-_\/=~\.+ < /dev/urandom | head -c 50"
if ! vault kv list $(dirname ${VAULT_KV_PATH}) 2>/dev/null | grep -q -E "^$(basename ${VAULT_KV_PATH})\$"; then if ! vault kv list $(dirname ${VAULT_KV_PATH}) 2>/dev/null | grep -q -E "^$(basename ${VAULT_KV_PATH})\$"; then
vault kv put ${VAULT_KV_PATH} \ vault kv put ${VAULT_KV_PATH} \

4
example/vault/policies/matrix-synapse.hcl
View File

@ -1,7 +1,7 @@
path "/kv/data/service/matrix" { path "kv/data/service/matrix" {
capabilities = ["read"] capabilities = ["read"]
} }
path "/database/creds/matrix-synapse" { path "database/creds/matrix-synapse" {
capabilities = ["read"] capabilities = ["read"]
} }