Merge branch 'SergeyKodolov-app/matrix-conduit'

This commit is contained in:
Nicolas Meienberger 2023-08-15 20:39:16 +02:00
commit 6d5e6f1559
2 changed files with 27 additions and 11 deletions

View File

@ -7,11 +7,9 @@
"force_expose": true,
"no_gui": true,
"id": "matrix-conduit",
"tipi_version": 3,
"tipi_version": 4,
"version": "0.6.0",
"categories": [
"social"
],
"categories": ["social"],
"description": "Conduit is a fast Matrix homeserver thats easy to set up and just works. You can install it on a mini-computer like the Raspberry Pi to host Matrix for your family, friends or company.",
"short_desc": "Conduit is a simple, fast and reliable chat server written in Rust",
"author": "Timo Kösters",
@ -32,9 +30,10 @@
"env_variable": "ALLOW_FEDERATION"
},
{
"type": "array",
"type": "text",
"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 +50,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": "text",
"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"
}
]
}

View File

@ -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