Version 1.74.0-1

CHANGELOG.md

@@ -1032,3 +1032,6 @@
 * Fix a long-standing bug where the synapse_port_db failed to configure sequences for application services and partial stated rooms. (#16043)
 * Fix long-standing bug with deletion in dehydrated devices v2. (#16046)
 
+[1.74.0]
+* Turn addon can be optionally enabled/disabled
+

CloudronManifest.json

@@ -5,7 +5,7 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG.md",
   "tagline": "Secure & decentralized communication",
-  "version": "1.73.0",
+  "version": "1.74.0-1",
   "upstreamVersion": "1.90.0",
   "healthCheckPath": "/",
   "httpPort": 8008,
@@ -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.5.1",
   "forumUrl": "https://forum.cloudron.io/category/50/matrix-synapse-riot",
   "documentationUrl": "https://docs.cloudron.io/apps/synapse/",
   "optionalSso": true

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
+if [[ -n "${CLOUDRON_TURN_SERVER:-}" ]]; then
-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=[]" /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_uris[0]=\"turn:${CLOUDRON_TURN_SERVER}:${CLOUDRON_TURN_TLS_PORT}?transport=udp\"" /app/data/configs/homeserver.yaml
-yq eval -i ".turn_shared_secret=\"${CLOUDRON_TURN_SECRET}\"" /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"

test/package-lock.json

@@ -9,11 +9,11 @@
       "version": "1.0.0",
       "license": "ISC",
       "dependencies": {
-        "chromedriver": "^115.0.1",
+        "chromedriver": "^116.0.0",
         "expect.js": "^0.3.1",
         "mocha": "^10.2.0",
         "selenium-webdriver": "^4.11.1",
-        "superagent": "^8.1.0"
+        "superagent": "^8.1.2"
       }
     },
     "node_modules/@testim/chrome-version": {
@@ -236,9 +236,9 @@
       }
     },
     "node_modules/chromedriver": {
-      "version": "115.0.1",
+      "version": "116.0.0",
-      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-115.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-116.0.0.tgz",
-      "integrity": "sha512-faE6WvIhXfhnoZ3nAxUXYzeDCKy612oPwpkUp0mVkA7fZPg2JHSUiYOQhUYgzHQgGvDWD5Fy2+M2xV55GKHBVQ==",
+      "integrity": "sha512-/TQaRn+RUAYnVqy5Vx8VtU8DvtWosU8QLM2u7BoNM5h55PRQPXF/onHAehEi8Sj/CehdKqH50NFdiumQAUr0DQ==",
       "hasInstallScript": true,
       "dependencies": {
         "@testim/chrome-version": "^1.1.3",
@@ -1262,9 +1262,9 @@
       }
     },
     "node_modules/superagent": {
-      "version": "8.1.0",
+      "version": "8.1.2",
-      "resolved": "https://registry.npmjs.org/superagent/-/superagent-8.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/superagent/-/superagent-8.1.2.tgz",
-      "integrity": "sha512-AYkYFEJj3owXXqZU6wvQfOicjYaQY6B6Oa4U7t9oWn/YIPpFUSzA9ire8Exa5bTdtFW05/WY3rPBhJx+T49WOw==",
+      "integrity": "sha512-6WTxW1EB6yCxV5VFOIPQruWGHqc3yI7hEmZK6h+pyk69Lk/Ut7rLUY6W/ONF2MjBuGjvmMiIpsrVJ2vjrHlslA==",
       "dependencies": {
         "component-emitter": "^1.3.0",
         "cookiejar": "^2.1.4",
@@ -1274,8 +1274,8 @@
         "formidable": "^2.1.2",
         "methods": "^1.1.2",
         "mime": "2.6.0",
-        "qs": "^6.11.2",
+        "qs": "^6.11.0",
-        "semver": "^7.5.4"
+        "semver": "^7.3.8"
       },
       "engines": {
         "node": ">=6.4.0 <13 || >=14"
@@ -1633,9 +1633,9 @@
       }
     },
     "chromedriver": {
-      "version": "115.0.1",
+      "version": "116.0.0",
-      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-115.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-116.0.0.tgz",
-      "integrity": "sha512-faE6WvIhXfhnoZ3nAxUXYzeDCKy612oPwpkUp0mVkA7fZPg2JHSUiYOQhUYgzHQgGvDWD5Fy2+M2xV55GKHBVQ==",
+      "integrity": "sha512-/TQaRn+RUAYnVqy5Vx8VtU8DvtWosU8QLM2u7BoNM5h55PRQPXF/onHAehEi8Sj/CehdKqH50NFdiumQAUr0DQ==",
       "requires": {
         "@testim/chrome-version": "^1.1.3",
         "axios": "^1.4.0",
@@ -2372,9 +2372,9 @@
       "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="
     },
     "superagent": {
-      "version": "8.1.0",
+      "version": "8.1.2",
-      "resolved": "https://registry.npmjs.org/superagent/-/superagent-8.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/superagent/-/superagent-8.1.2.tgz",
-      "integrity": "sha512-AYkYFEJj3owXXqZU6wvQfOicjYaQY6B6Oa4U7t9oWn/YIPpFUSzA9ire8Exa5bTdtFW05/WY3rPBhJx+T49WOw==",
+      "integrity": "sha512-6WTxW1EB6yCxV5VFOIPQruWGHqc3yI7hEmZK6h+pyk69Lk/Ut7rLUY6W/ONF2MjBuGjvmMiIpsrVJ2vjrHlslA==",
       "requires": {
         "component-emitter": "^1.3.0",
         "cookiejar": "^2.1.4",
@@ -2384,8 +2384,8 @@
         "formidable": "^2.1.2",
         "methods": "^1.1.2",
         "mime": "2.6.0",
-        "qs": "^6.11.2",
+        "qs": "^6.11.0",
-        "semver": "^7.5.4"
+        "semver": "^7.3.8"
       }
     },
     "supports-color": {

test/package.json

@@ -9,10 +9,10 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "chromedriver": "^115.0.1",
+    "chromedriver": "^116.0.0",
     "expect.js": "^0.3.1",
     "mocha": "^10.2.0",
     "selenium-webdriver": "^4.11.1",
-    "superagent": "^8.1.0"
+    "superagent": "^8.1.2"
   }
 }