From f450beb46f564917cababe8bf33d427eb5ca1c5b Mon Sep 17 00:00:00 2001 From: Girish Ramakrishnan Date: Wed, 23 Aug 2023 06:50:59 +0530 Subject: [PATCH] Optional turn server support --- CloudronManifest.json | 4 ++-- start.sh | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CloudronManifest.json b/CloudronManifest.json index 6c5cfd6..b06c7c0 100644 --- a/CloudronManifest.json +++ b/CloudronManifest.json @@ -15,7 +15,7 @@ "ldap": {}, "postgresql": {}, "sendmail": { "supportsDisplayName": true }, - "turn": {} + "turn": { "optional": true } }, "manifestVersion": 2, "website": "https://matrix.org", @@ -30,7 +30,7 @@ "https://screenshots.cloudron.io/org.matrix.synapse/3.png" ], "postInstallMessage": "file://POSTINSTALL.md", - "minBoxVersion": "7.2.0", + "minBoxVersion": "7.3.1", "forumUrl": "https://forum.cloudron.io/category/50/matrix-synapse-riot", "documentationUrl": "https://docs.cloudron.io/apps/synapse/", "optionalSso": true diff --git a/start.sh b/start.sh index 46ff1da..d4a7a12 100755 --- a/start.sh +++ b/start.sh @@ -81,10 +81,12 @@ else fi # turn (https://github.com/matrix-org/synapse/blob/master/docs/turn-howto.md#synapse-setup) -yq eval -i ".turn_uris=[]" /app/data/configs/homeserver.yaml -yq eval -i ".turn_uris[0]=\"turn:${CLOUDRON_TURN_SERVER}:${CLOUDRON_TURN_TLS_PORT}?transport=udp\"" /app/data/configs/homeserver.yaml -yq eval -i ".turn_uris[1]=\"turn:${CLOUDRON_TURN_SERVER}:${CLOUDRON_TURN_TLS_PORT}?transport=tcp\"" /app/data/configs/homeserver.yaml -yq eval -i ".turn_shared_secret=\"${CLOUDRON_TURN_SECRET}\"" /app/data/configs/homeserver.yaml +if [[ -n "${CLOUDRON_TURN_SERVER:-}" ]]; then + yq eval -i ".turn_uris=[]" /app/data/configs/homeserver.yaml + yq eval -i ".turn_uris[0]=\"turn:${CLOUDRON_TURN_SERVER}:${CLOUDRON_TURN_TLS_PORT}?transport=udp\"" /app/data/configs/homeserver.yaml + yq eval -i ".turn_uris[1]=\"turn:${CLOUDRON_TURN_SERVER}:${CLOUDRON_TURN_TLS_PORT}?transport=tcp\"" /app/data/configs/homeserver.yaml + yq eval -i ".turn_shared_secret=\"${CLOUDRON_TURN_SECRET}\"" /app/data/configs/homeserver.yaml +fi # fix permissions echo "==> Fixing permissions"