diff --git a/.env b/.env index 5df369c..bcb03b8 100644 --- a/.env +++ b/.env @@ -1,6 +1,6 @@ PROD_URL=matrix.gmoker.com SERVER_NAME=gmoker.com -IMAGEAPP=ghcr.io/element-hq/synapse:v1.106.0 +IMAGEAPP=ghcr.io/element-hq/synapse:v1.107.0 TURN_URL=turn.test.gmoker.com IMAGECOTURN=docker.io/coturn/coturn:4.6.2 diff --git a/homeserver.yaml b/config/homeserver.yaml similarity index 100% rename from homeserver.yaml rename to config/homeserver.yaml diff --git a/log.config b/config/log.config similarity index 100% rename from log.config rename to config/log.config diff --git a/manifests/bin/deploy.sh b/manifests/bin/deploy.sh index 31c4fac..0e134ef 100755 --- a/manifests/bin/deploy.sh +++ b/manifests/bin/deploy.sh @@ -31,7 +31,7 @@ function kgcmkey() { } function get_synapse_key() { - kgcmkey synapse-config 'homeserver\.yaml' | awk -F\" "/^\s*$1/{print \$2}" || openssl rand -hex 32 + kgcmkey synapse 'homeserver\.yaml' | awk -F\" "/^\s*$1/{print \$2}" || openssl rand -hex 32 } @@ -47,7 +47,7 @@ export API_SECRET; API_SECRET="$(get_synapse_key macaroon_secr export TURN_SHARED_SECRET; TURN_SHARED_SECRET="$(get_synapse_key turn_shared_secret)" export REGISTRATION_SECRET; REGISTRATION_SECRET="$(get_synapse_key registration_shared_secret)" -kcreatecm synapse-config \ +kcreatecm synapse \ --from-file=homeserver.yaml=<(envsubst "$(env | xargs printf '$%s ')" < homeserver.yaml) \ --from-file=log.config=<(envsubst "$(env | xargs printf '$%s ')" < log.config) diff --git a/manifests/common/app.yaml b/manifests/common/app.yaml index 7db7c30..2af9182 100644 --- a/manifests/common/app.yaml +++ b/manifests/common/app.yaml @@ -69,7 +69,6 @@ spec: volumeMounts: - name: config mountPath: /config/ - readOnly: true - name: data mountPath: /data/ - name: keys @@ -79,7 +78,7 @@ spec: volumes: - name: config configMap: - name: synapse-config + name: synapse - name: keys persistentVolumeClaim: claimName: keys diff --git a/manifests/common/delegation.yaml b/manifests/common/delegation.yaml index fe5dfd6..995c478 100644 --- a/manifests/common/delegation.yaml +++ b/manifests/common/delegation.yaml @@ -85,7 +85,6 @@ spec: volumeMounts: - name: delegation mountPath: /etc/nginx/conf.d/ - readOnly: true volumes: - name: delegation configMap: