From c7ee28fd90a008f11f9f95720aec2a0127729049 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9=20=D0=9A=D0=BE=D0=B4?=
 =?UTF-8?q?=D0=BE=D0=BB=D0=BE=D0=B2?= <kodolov@lanit.ru>
Date: Sun, 13 Aug 2023 20:00:10 +0300
Subject: [PATCH] update matrix-conduit configuration

---
 apps/matrix-conduit/config.json        | 21 ++++++++++++++++++---
 apps/matrix-conduit/docker-compose.yml | 11 +++++++----
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/apps/matrix-conduit/config.json b/apps/matrix-conduit/config.json
index 7a62d6a7..7548cbfa 100644
--- a/apps/matrix-conduit/config.json
+++ b/apps/matrix-conduit/config.json
@@ -7,7 +7,7 @@
   "force_expose": true,
   "no_gui": true,
   "id": "matrix-conduit",
-  "tipi_version": 3,
+  "tipi_version": 4,
   "version": "0.6.0",
   "categories": [
     "social"
@@ -34,7 +34,8 @@
     {
       "type": "array",
       "label": "Trusted Servers",
-      "hint": "[\"matrix.org\"]",
+      "hint": "List of domain names",
+      "placeholder": "[\"matrix.org\"]",
       "regex": "^\\[((\"[^\"]*\")(, ?(\"[^\"]*\"))*)?\\]$",
       "pattern_error": "Must be in list of domain names format",
       "required": false,
@@ -51,9 +52,23 @@
       "type": "text",
       "label": "Loggin Level",
       "hint": "Available levels: error, warn, info, debug, trace",
-      "placeholder": "-warn,rocket=off,_=off,sled=off",
+      "placeholder": "warn,rocket=off,_=off,sled=off",
       "required": false,
       "env_variable": "LOG"
+    },
+    {
+      "type": "array",
+      "label": "TURN URIs",
+      "hint": "List of TURN server URIs turn:/turns:",
+      "placeholder": "[\"turn:<your server domain>?transport=udp\", \"turn:<your server domain>?transport=tcp\"]",
+      "required": false,
+      "env_variable": "TURN_URIS"
+    },
+    {
+      "type": "password",
+      "label": "TURN Secret",
+      "required": false,
+      "env_variable": "TURN_SECRET"
     }
   ]
 }
diff --git a/apps/matrix-conduit/docker-compose.yml b/apps/matrix-conduit/docker-compose.yml
index 9430bcbc..69ec6f26 100644
--- a/apps/matrix-conduit/docker-compose.yml
+++ b/apps/matrix-conduit/docker-compose.yml
@@ -8,13 +8,16 @@ services:
       CONDUIT_SERVER_NAME: ${APP_DOMAIN}
       CONDUIT_DATABASE_PATH: /var/lib/matrix-conduit/
       CONDUIT_DATABASE_BACKEND: rocksdb
+      CONDUIT_ADDRESS: 0.0.0.0
       CONDUIT_PORT: 6167
+      CONDUIT_LOG: ${LOG:-warn,rocket=off,_=off,sled=off}
       CONDUIT_MAX_REQUEST_SIZE: ${MAX_REQUEST_SIZE:-20000000}
       CONDUIT_ALLOW_REGISTRATION: ${ALLOW_REGISTRATION:-false}
       CONDUIT_ALLOW_FEDERATION: ${ALLOW_FEDERATION:-false}
       CONDUIT_TRUSTED_SERVERS: ${TRUSTED_SERVERS:-[]}
-      CONDUIT_LOG: ${LOG:-warn,rocket=off,_=off,sled=off}
-      CONDUIT_ADDRESS: 0.0.0.0
+      CONDUIT_ALLOW_CHECK_FOR_UPDATES: false
+      CONDUIT_TURN_URIS: ${TURN_URIS:-["turn:localhost?transport=udp", "turn:localhost?transport=tcp"]}
+      CONDUIT_TURN_SECRET: ${TURN_SECRET:-turnsecret}
       CONDUIT_CONFIG: "" # Ignore this
     restart: unless-stopped
     volumes:
@@ -68,12 +71,12 @@ services:
       traefik.http.routers.matrix-well-knows-insecure.service: matrix-well-knows
       traefik.http.routers.matrix-well-knows-insecure.middlewares: matrix-well-knows-web-redirect
       # Websecure
-      traefik.http.routers.matrix-well-knows.rule: Host(`${APP_DOMAIN}`)
+      traefik.http.routers.matrix-well-knows.rule: Host(`${APP_DOMAIN}`) && PathPrefix(`/.well-known/matrix`)
       traefik.http.routers.matrix-well-knows.entrypoints: websecure
       traefik.http.routers.matrix-well-knows.service: matrix-well-knows
       traefik.http.routers.matrix-well-knows.tls.certresolver: myresolver
       # Local domain
-      traefik.http.routers.matrix-well-knows-local-insecure.rule: Host(`matrix-well-knows.${LOCAL_DOMAIN}`)
+      traefik.http.routers.matrix-well-knows-local-insecure.rule: Host(`matrix-well-knows.${LOCAL_DOMAIN}`) && PathPrefix(`/.well-known/matrix`)
       traefik.http.routers.matrix-well-knows-local-insecure.entrypoints: web
       traefik.http.routers.matrix-well-knows-local-insecure.service: matrix-well-knows
       traefik.http.routers.matrix-well-knows-local-insecure.middlewares: matrix-well-knows-web-redirect