Pin docker image tag

Update for COTURN
SERVICE -> APP
2021-04-03 14:38:46 +02:00 · 2020-10-29 19:45:42 +02:00 · 2020-10-29 19:42:05 +02:00 · 2020-10-06 01:52:00 +02:00 · 2020-09-11 18:14:16 +02:00 · 2020-09-11 18:14:02 +02:00
24 changed files with 115 additions and 3926 deletions
--- a/.env.sample
+++ b/.env.sample
@ -1,103 +0,0 @@
-TYPE=matrix-synapse
-
-DOMAIN=matrix.example.com
-LETS_ENCRYPT_ENV=production
-
-SECRET_DB_PASSWORD_VERSION=v1
-
-SYNAPSE_ADMIN_EMAIL=admin@example.com
-
-SECRET_REGISTRATION_SHARED_SECRET_VERSION=v1
-SECRET_MACAROON_SECRET_KEY_VERSION=v1
-SECRET_FORM_SECRET_VERSION=v1
-
-COMPOSE_FILE="compose.yml"
-
-#DISABLE_FEDERATION=1
-
-# Set "true" to enable federation endpoint on $DOMAIN/.well-known/matrix/server
-SERVE_SERVER_WELLKNOWN=false
-
-ENABLE_REGISTRATION=false
-PASSWORD_LOGIN_ENABLED=true
-
-#AUTO_JOIN_ROOM_ENABLED=1
-#AUTO_JOIN_ROOM="#example:example.com"
-
-SQL_LOG_LEVEL=WARN
-ROOT_LOG_LEVEL=WARN
-
-REDACTION_RETENTION_PERIOD=7d
-
-RETENTION_MAX_LIFETIME=4w
-
-ENABLE_3PID_LOOKUP=true
-
-USER_IPS_MAX_AGE=1d
-
-ENCRYPTED_BY_DEFAULT=all
-
-#ENABLE_ALLOWLIST=1
-#FEDERATION_ALLOWLIST="[]"
-
-#COMPOSE_FILE="$COMPOSE_FILE:compose.keycloak.yml"
-#KEYCLOAK_ENABLED=1
-#KEYCLOAK_ID=keycloak
-#KEYCLOAK_NAME=
-#KEYCLOAK_URL=
-#KEYCLOAK_CLIENT_ID=
-#KEYCLOAK_CLIENT_DOMAIN=
-#KEYCLOAK_ALLOW_EXISTING_USERS=false
-#SECRET_KEYCLOAK_CLIENT_SECRET_VERSION=v1
-
-#COMPOSE_FILE="$COMPOSE_FILE:compose.keycloak2.yml"
-#KEYCLOAK2_ENABLED=1
-#KEYCLOAK2_ID=keycloak2
-#KEYCLOAK2_NAME=
-#KEYCLOAK2_URL=
-#KEYCLOAK2_CLIENT_ID=
-#KEYCLOAK2_CLIENT_DOMAIN=
-#KEYCLOAK2_ALLOW_EXISTING_USERS=false
-#SECRET_KEYCLOAK2_CLIENT_SECRET_VERSION=v1
-
-#COMPOSE_FILE="$COMPOSE_FILE:compose.turn.yml"
-#TURN_ENABLED=1
-#TURN_URIS="[\"turns:coturn.foo.zone?transport=udp\", \"turns:coturn.foo.zone?transport=tcp\"]"
-#TURN_ALLOW_GUESTS=true
-#KEYCLOAK2_ALLOW_EXISTING_USERS=false
-#SECRET_TURN_SHARED_SECRET_VERSION=v1
-
-#COMPOSE_FILE="$COMPOSE_FILE:compose.smtp.yml"
-#SMTP_ENABLED=1
-#SMTP_APP_NAME=
-#SMTP_FROM=
-#SMTP_HOST=
-#SMTP_PORT=
-#SMTP_USER=
-#SECRET_SMTP_PASSWORD_VERSION=v1
-
-#APP_SERVICES_ENABLED=1
-#APP_SERVICE_CONFIGS="[\"...\"]"
-
-#COMPOSE_FILE="$COMPOSE_FILE:compose.telegram.yml"
-#APP_SERVICE_BOT_USERNAME=telegrambot
-#APP_SERVICE_DISPLAY_NAME="Telegram bridge bot"
-#APP_SERVICE_ID=
-#HOMESERVER_DOMAIN=
-#HOMESERVER_URL=
-#VERIFY_SSL=false
-#ENABLE_ENCRYPTION=true
-#TELEGRAM_APP_ID=
-#TELEGRAM_BRIDGE_ADMIN_1=
-#TELEGRAM_BRIDGE_ADMIN_2=
-#SECRET_TELEGRAM_DB_PASSWORD_VERSION=v1
-#SECRET_TELEGRAM_API_HASH_VERSION=v1
-#SECRET_TELEGRAM_BOT_TOKEN_VERSION=v1
-#SECRET_TELEGRAM_AS_TOKEN_VERSION=v1
-#SECRET_TELEGRAM_HS_TOKEN_VERSION=v1
-
-COMPOSE_FILE="$COMPOSE_FILE:compose.discord.yml"
-#DISCORD_CLIENT_ID=
-#DISCORD_BRIDGE_ADMIN=
-#SECRET_DISCORD_BOT_TOKEN_VERSION=v1
-#SECRET_DISCORD_DB_PASSWORD_VERSION=v1
--- a/.envrc.sample
+++ b/.envrc.sample
@ -0,0 +1,11 @@
+export STACK_NAME=matrix
+export APP=matrix
+
+export DOMAIN=matrix.example.com
+export LETS_ENCRYPT_ENV=production
+
+export ENTRYPOINT_CONF_VERSION=v1
+
+## TURN server
+#export TURNSERVER_CONF_VERSION=v1
+#export COTURN_SHARED_SECRET_VERSION=v1
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1 @@
-.envrc
-synapse
+/.envrc
--- a/README.md
+++ b/README.md
@ -1,139 +1,19 @@
-# Matrix (Synapse)
+# Matrix Synapse

-<!-- metadata -->
+Matrix Synapse, based on the [official `matrixdotorg/synapse`
+image][synapse-docker].

-* **Category**: Apps
-* **Status**: 0, work-in-progress
-* **Image**: [`matrixdotorg/synapse`](https://hub.docker.com/r/matrixdotorg/synapse), 4, upstream
-* **Healthcheck**: Yes
-* **Backups**: No
-* **Email**: Yes
-* **Tests**: No
-* **SSO**: Yes
+1. Set up Docker Swarm and [`abra`][abra]
+2. Deploy [`compose-stacks/traefik`][compose-traefik]
+2. `cp .envrc.sample .envrc`
+3. Edit `.envrc` - be sure to change `$DOMAIN` to something that resolves to
+   your Docker swarm box
+4. `direnv allow` (or `. .envrc`)
+4. `abra secret_generate coturn_shared_secret`
+5. `abra deploy`
+6. `abra service_run synapse` to open a shell
+7. `abra register_new_matrix_user`

-<!-- endmetadata -->
-
-## Basic usage
-
-1. Set up Docker Swarm and [`abra`](https://docs.coopcloud.tech/abra/)
-2. Deploy [`coop-cloud/traefik`](https://git.coopcloud.tech/coop-cloud/traefik)
-3. `abra app new matrix-synapse --secrets` (optionally with `--pass` if you'd like to save secrets in `pass`)
-4. `abra app YOURAPPDOMAIN config` - be sure to change `$DOMAIN` to something that resolves to your Docker swarm box
-5. `abra app YOURAPPDOMAIN deploy`
-6. Create an initial user: `abra app YOURAPPDOMAIN run app register_new_matrix_user -c /data/homeserver.yaml http://localhost:8008`
-
-## Tips & Tricks
-
-### Disabling federation
-
-> We're not sure this does it exactly and there is still a discussion running
-> upstrem about whether this is the right way to do it & whether it could be
-> more convenient. We welcome issues / change sets to close up more federation
-> functionality.
-
- use `DISABLE_FEDERATION=1` to turn off federation listeners
- don't use [`compose.matrix.yml`](https://git.coopcloud.tech/coop-cloud/traefik/src/branch/master/compose.matrix.yml) in your traefik config to keep the federation ports closed
-
-### Enabling federation
-
-See [`#27`](https://git.coopcloud.tech/coop-cloud/matrix-synapse/pulls/27) for more.
-
-Depending on your setup, using `SERVE_SERVER_WELLKNOWN=true` might work to start federating.
-
-### Seeing what changed in `homeserver.yaml` between versions
-
-Change the version range to suit your needs.
-
-```
-git clone https://github.com/matrix-org/synapse
-cd synapse/docs
-git log --follow -p v1.48.0..v1.51.0 sample_config.yaml
-```
-
-### Generating a new `homeserver.yaml`
-
-The default is also available to see [here](https://matrix-org.github.io/synapse/latest/usage/configuration/homeserver_sample_config.html).
-
-```
-docker run -it \
-  --entrypoint="" \
-  -e SYNAPSE_SERVER_NAME=foo.com \
-  -e SYNAPSE_REPORT_STATS=no \
-  matrixdotorg/synapse:v1.48.0 \
-  sh -c '/start.py generate; cat /data/homeserver.yaml' > homeserver.yaml.tmpl`
-```
-
-### Generating a new `<server>.log.config`
-
-```
-docker run -it \
-  --entrypoint="" \
-  -e SYNAPSE_SERVER_NAME=foo.com \
-  -e SYNAPSE_REPORT_STATS=no \
-  matrixdotorg/synapse:v1.48.0 \
-  sh -c '/start.py generate; cat /data/foo.com.log.config' > log.config
-```
-
-### Getting client discovery on a custom domain
-
-You'll need to deploy something like [this](https://git.autonomic.zone/ruangrupa/well-known-uris).
-
-This could be implemented in this recipe but we haven't merged it in yet. Change sets are welcome.
-
-### Telegram bridging
-
-> WIP
-
-Setting it up is a bit of a chicken/egg & chasing cats moment.
-
-You need to get your bot setup on the telegram side first and have these values:
-
-```
-api_id: ...
-api_hash: ...
-telegram_bot_token: ...
-```
-
-Here is a rough guide:
-
-```
-abra app secret insert <domain> telegram_api_hash v1 <secret>
-abra app secret insert <domain> telegram_bot_token v1 <secret>
-abra app secret generate -a <domain>
-
-abra app deploy <domain>
-abra app run matrix.fva.wtf telegram_bridge cat /data/registration.yaml
-abra app undeploy <domain>
-
-abra app secret rm <domain> telegram_as_token
-abra app secret insert <domain> telegram_as_token v1 <secret>
-
-abra app secret rm <domain> telegram_as_token
-abra app secret insert <domain> telegram_hs_token v1 <secret>
-
-abra app deploy <domain>
-```
-
-Some helpful documentation:
-
- [`docs.mau.fi`](https://docs.mau.fi/bridges/python/setup/docker.html?bridge=telegram)
- [`example-config.yaml`](https://mau.dev/mautrix/telegram/-/blob/master/mautrix_telegram/example-config.yaml)
-
-### Discord bridging
-
-> WIP
-
-Just as messy as the Telegram bridging above! Rough guide:
-
- get a local copy of [`config.yaml`](https://github.com/matrix-org/matrix-appservice-discord/blob/develop/config/config.sample.yaml)
- fill it out with the values you need, all the discord token stuff, etc.
- run `mkdir -p data && cp config.yaml data/` then `docker run --rm -v data:/data halfshot/matrix-appservice-discord:v1.0.0 sh -c "cd /data && node /build/src/discordas.js -r -u "http://discordbridge:9005" -c config.yaml"`
- this generates the app service registration configuration you need to feed to the homeserver
- run secret generation for the `discord_db_password`, insert your `discord_bot_token`
- run `abra app cp <domain> discord-registration.yaml app:/discord-data` (it has to be called `discord-registration.yaml`)
- deploy the bridge & happy hacking
-
-Some helpful documentation:
-
- [`matrix-org/matrix-appservice-discord` docs](https://github.com/matrix-org/matrix-appservice-discord#bridging-a-room)
- [`t2bot.io/discord`](https://t2bot.io/discord/)
+[synapse-docker]: https://hub.docker.com/r/matrixdotorg/synapse
+[abra]: https://git.autonomic.zone/autonomic-cooperative/abra
+[compose-traefik]: https://git.autonomic.zone/compose-stacks/traefik
--- a/abra-commands.sh
+++ b/abra-commands.sh
@ -0,0 +1,3 @@
+sub_register_new_matrix_user() {
+	abra run synapse register_new_matrix_user -c /data/homeserver.yaml http://localhost:8008
+}
--- a/abra.sh
+++ b/abra.sh
@ -1,5 +0,0 @@
-export ENTRYPOINT_CONF_VERSION=v1
-export HOMESERVER_YAML_VERSION=v11
-export LOG_CONFIG_VERSION=v2
-export TELEGRAM_BRIDGE_YAML_VERSION=v2
-export DISCORD_BRIDGE_YAML_VERSION=v1
--- a/compose.coturn.yml
+++ b/compose.coturn.yml
@ -0,0 +1,35 @@
+services:
+  app:
+    environment:
+      - TURN_SERVER=${DOMAIN}
+      - TURN_PORT=3478
+    secrets:
+      - coturn_shared_secret
+
+  coturn:
+    image: instrumentisto/coturn:latest
+    networks:
+     - swarm_host
+    secrets:
+      - coturn_shared_secret
+    configs:
+      - source: turnserver_conf
+        target: /etc/coturn/turnserver.conf
+
+configs:
+  turnserver_conf:
+    name: ${STACK_NAME}_turnserver_conf_${TURNSERVER_CONF_VERSION}
+    file: turnserver.conf.tmpl
+    template_driver: golang
+
+secrets:
+  coturn_shared_secret:    
+    external: true 
+    name: ${STACK_NAME}_coturn_shared_secret_${COTURN_SHARED_SECRET_VERSION}
+
+networks:
+  # use host-mode networking until Docker can handle mass port-forwards:
+  # https://github.com/moby/moby/issues/11185
+  swarm_host:
+    external:
+      name: 'host'
--- a/compose.discord.yml
+++ b/compose.discord.yml
@ -1,66 +0,0 @@
---
-version: "3.8"
-
-services:
-  app:
-    environment:
-      - APP_SERVICES_ENABLED
-      - APP_SERVICE_CONFIGS
-    volumes:
-      - discord-data:/discord-data
-
-  discordbridge:
-    image: halfshot/matrix-appservice-discord:v1.0.0
-    depends_on:
-      - discorddb
-    configs:
-      - source: discord_bridge_yaml
-        target: /data/config.yaml
-    environment:
-      - DISCORD_CLIENT_ID
-      - DISCORD_BRIDGE_ADMIN
-      - HOMESERVER_DOMAIN
-      - HOMESERVER_URL
-    secrets:
-      - discord_bot_token
-      - discord_db_password
-    volumes:
-      - discord-data:/data
-    networks:
-      - internal
-
-  discorddb:
-    image: postgres:13-alpine
-    secrets:
-      - discord_db_password
-    environment:
-      - LC_COLLATE=C
-      - LC_CTYPE=C
-      - POSTGRES_DB=discordbridge
-      - POSTGRES_INITDB_ARGS="-E \"UTF8\""
-      - POSTGRES_PASSWORD_FILE=/run/secrets/discord_db_password
-      - POSTGRES_USER=discordbridge
-    networks:
-      - internal
-    healthcheck:
-      test: ["CMD", "pg_isready", "-U", "synapse"]
-    volumes:
-      - discord-postgres:/var/lib/postgresql/data
-
-configs:
-  discord_bridge_yaml:
-    name: ${STACK_NAME}_discord_bridge_yaml_${DISCORD_BRIDGE_YAML_VERSION}
-    file: discord_bridge.yaml.tmpl
-    template_driver: golang
-
-volumes:
-  discord-data:
-  discord-postgres:
-
-secrets:
-  discord_db_password:
-    external: true
-    name: ${STACK_NAME}_discord_db_password_${SECRET_DISCORD_DB_PASSWORD_VERSION}
-  discord_bot_token:
-    external: true
-    name: ${STACK_NAME}_discord_bot_token_${SECRET_DISCORD_BOT_TOKEN_VERSION}
--- a/compose.keycloak.yml
+++ b/compose.keycloak.yml
@ -1,24 +0,0 @@
---
-version: "3.8"
-
-services:
-  app:
-    secrets:
-      - db_password
-      - form_secret
-      - keycloak_client_secret
-      - macaroon_secret_key
-      - registration_shared_secret
-    environment:
-      - KEYCLOAK_CLIENT_DOMAIN
-      - KEYCLOAK_CLIENT_ID
-      - KEYCLOAK_ENABLED
-      - KEYCLOAK_NAME
-      - KEYCLOAK_ID
-      - KEYCLOAK_URL
-      - KEYCLOAK_ALLOW_EXISTING_USERS
-
-secrets:
-  keycloak_client_secret:
-    external: true
-    name: ${STACK_NAME}_keycloak_client_secret_${SECRET_KEYCLOAK_CLIENT_SECRET_VERSION}
--- a/compose.keycloak2.yml
+++ b/compose.keycloak2.yml
@ -1,19 +0,0 @@
---
-version: "3.8"
-
-services:
-  app:
-    secrets:
-      - keycloak2_client_secret
-    environment:
-      - KEYCLOAK2_ALLOW_EXISTING_USERS
-      - KEYCLOAK2_CLIENT_ID
-      - KEYCLOAK2_ENABLED
-      - KEYCLOAK2_ID
-      - KEYCLOAK2_NAME
-      - KEYCLOAK2_URL
-
-secrets:
-  keycloak2_client_secret:
-    external: true
-    name: ${STACK_NAME}_keycloak2_client_secret_${SECRET_KEYCLOAK2_CLIENT_SECRET_VERSION}
--- a/compose.smtp.yml
+++ b/compose.smtp.yml
@ -1,23 +0,0 @@
---
-version: "3.8"
-
-services:
-  app:
-    secrets:
-      - db_password
-      - form_secret
-      - macaroon_secret_key
-      - registration_shared_secret
-      - smtp_password
-    environment:
-      - SMTP_APP_NAME
-      - SMTP_ENABLED
-      - SMTP_FROM
-      - SMTP_HOST
-      - SMTP_PORT
-      - SMTP_USER
-
-secrets:
-  smtp_password:
-    external: true
-    name: ${STACK_NAME}_smtp_password_${SECRET_SMTP_PASSWORD_VERSION}
--- a/compose.telegram.yml
+++ b/compose.telegram.yml
@ -1,84 +0,0 @@
---
-version: "3.8"
-
-services:
-  app:
-    environment:
-      - APP_SERVICES_ENABLED
-      - APP_SERVICE_CONFIGS
-    volumes:
-      - telegram-data:/telegram-data
-
-  telegrambridge:
-    image: dock.mau.dev/mautrix/telegram:1f5b91cbec7866663d8dd8f4c9a62115e2905552-amd64
-    depends_on:
-      - telegramdb
-    configs:
-      - source: telegram_bridge_yaml
-        target: /data/config.yaml
-    environment:
-      - APP_SERVICE_BOT_USERNAME
-      - APP_SERVICE_DISPLAY_NAME
-      - APP_SERVICE_ID
-      - ENABLE_ENCRYPTION
-      - HOMESERVER_DOMAIN
-      - HOMESERVER_URL
-      - TELEGRAM_APP_ID
-      - TELEGRAM_BRIDGE_ADMIN_1
-      - TELEGRAM_BRIDGE_ADMIN_2
-      - VERIFY_SSL
-    secrets:
-      - telegram_api_hash
-      - telegram_as_token
-      - telegram_bot_token
-      - telegram_db_password
-      - telegram_hs_token
-    volumes:
-      - telegram-data:/data
-    networks:
-      - internal
-
-  telegramdb:
-    image: postgres:13-alpine
-    secrets:
-      - telegram_db_password
-    environment:
-      - LC_COLLATE=C
-      - LC_CTYPE=C
-      - POSTGRES_DB=telegrambridge
-      - POSTGRES_INITDB_ARGS="-E \"UTF8\""
-      - POSTGRES_PASSWORD_FILE=/run/secrets/telegram_db_password
-      - POSTGRES_USER=telegrambridge
-    networks:
-      - internal
-    healthcheck:
-      test: ["CMD", "pg_isready", "-U", "synapse"]
-    volumes:
-      - telegram-postgres:/var/lib/postgresql/data
-
-configs:
-  telegram_bridge_yaml:
-    name: ${STACK_NAME}_telegram_bridge_yaml_${TELEGRAM_BRIDGE_YAML_VERSION}
-    file: telegram_bridge.yaml.tmpl
-    template_driver: golang
-
-volumes:
-  telegram-data:
-  telegram-postgres:
-
-secrets:
-  telegram_db_password:
-    external: true
-    name: ${STACK_NAME}_telegram_db_password_${SECRET_TELEGRAM_DB_PASSWORD_VERSION}
-  telegram_api_hash:
-    external: true
-    name: ${STACK_NAME}_telegram_api_hash_${SECRET_TELEGRAM_API_HASH_VERSION}
-  telegram_bot_token:
-    external: true
-    name: ${STACK_NAME}_telegram_bot_token_${SECRET_TELEGRAM_BOT_TOKEN_VERSION}
-  telegram_as_token:
-    external: true
-    name: ${STACK_NAME}_telegram_as_token_${SECRET_TELEGRAM_AS_TOKEN_VERSION}
-  telegram_hs_token:
-    external: true
-    name: ${STACK_NAME}_telegram_hs_token_${SECRET_TELEGRAM_HS_TOKEN_VERSION}
--- a/compose.turn.yml
+++ b/compose.turn.yml
@ -1,20 +0,0 @@
---
-version: "3.8"
-
-services:
-  app:
-    secrets:
-      - db_password
-      - form_secret
-      - macaroon_secret_key
-      - registration_shared_secret
-      - turn_shared_secret
-    environment:
-      - TURN_ALLOW_GUESTS
-      - TURN_ENABLED
-      - TURN_URIS
-
-secrets:
-  turn_shared_secret:
-    external: true
-    name: ${STACK_NAME}_turn_shared_secret_${SECRET_TURN_SHARED_SECRET_VERSION}
--- a/compose.yml
+++ b/compose.yml
@ -3,120 +3,47 @@ version: "3.8"

 services:
  app:
-    image: "matrixdotorg/synapse:v1.62.0"
+    image: "matrixdotorg/synapse:v1.9.1"
    volumes:
-      - "data:/data"
-    depends_on:
-      - db
-    secrets:
-      - db_password
-      - registration_shared_secret
-      - macaroon_secret_key
-      - form_secret
+      - "synapse:/data"
    environment:
-      - ENCRYPTED_BY_DEFAULT
-      - AUTO_JOIN_ROOM
-      - AUTO_JOIN_ROOM_ENABLED
-      - DISABLE_FEDERATION
-      - DOMAIN
-      - ENABLE_3PID_LOOKUP
-      - ENABLE_ALLOWLIST
-      - ENABLE_REGISTRATION
-      - FEDERATION_ALLOWLIST
-      - LETSENCRYPT_HOST=${DOMAIN}
-      - PASSWORD_LOGIN_ENABLED
-      - REDACTION_RETENTION_PERIOD
-      - ROOT_LOG_LEVEL
-      - SERVE_SERVER_WELLKNOWN
-      - SQL_LOG_LEVEL
-      - STACK_NAME
-      - SYNAPSE_ADMIN_EMAIL
-      - SYNAPSE_REPORT_STATS=no
-      - SYNAPSE_SERVER_NAME=${DOMAIN}
-      - USER_IPS_MAX_AGE
      - VIRTUAL_HOST=${DOMAIN}
      - VIRTUAL_PORT=8008
-      - RETENTION_MAX_LIFETIME
+      - LETSENCRYPT_HOST=${DOMAIN}
+      - SYNAPSE_SERVER_NAME=${DOMAIN}
+      - SYNAPSE_REPORT_STATS=no
    networks: 
      - proxy
-      - internal
-    entrypoint: /docker-entrypoint.sh
    configs:
-      - source: homeserver_yaml
-        target: /data/homeserver.yaml
-      - source: log_config
-        target: /data/log.config
      - source: entrypoint_conf
        target: /docker-entrypoint.sh
        mode: 0555
+    entrypoint: /docker-entrypoint.sh
    deploy:
      restart_policy:
        condition: on-failure
+        delay: "60s"
+        max_attempts: 3
+        window: 120s
      labels:
        - "traefik.enable=true"
        - "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=8008"
-        - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)"
-        - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
+        - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})"
        - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
-        - "coop-cloud.${STACK_NAME}.version=2.1.0+v1.62.0"
-
-  db:
-    image: postgres:13-alpine
-    secrets:
-      - db_password
-    environment:
-      - LC_COLLATE=C
-      - LC_CTYPE=C
-      - POSTGRES_DB=synapse
-      - POSTGRES_INITDB_ARGS="-E \"UTF8\""
-      - POSTGRES_PASSWORD_FILE=/run/secrets/db_password
-      - POSTGRES_USER=synapse
-    networks:
-      - internal
-    healthcheck:
-      test: ["CMD", "pg_isready", "-U", "synapse"]
-    volumes:
-      - postgres:/var/lib/postgresql/data
-    deploy:
-      labels:
-          backupbot.backup: "true"
-          backupbot.backup.pre-hook: "mkdir -p /tmp/backup/ && PGPASSWORD=$$(cat $${POSTGRES_PASSWORD_FILE}) pg_dump -U $${POSTGRES_USER} $${POSTGRES_DB} > /tmp/backup/backup.sql"
-          backupbot.backup.post-hook: "rm -rf /tmp/backup"
-          backupbot.backup.path: "/tmp/backup/"
+        - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
+        - "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
+        - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
+        - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"

 volumes:
-  data:
-  postgres:
+  synapse:

 networks:
  proxy:
    external: true
-  internal:

 configs:
  entrypoint_conf:
    name: ${STACK_NAME}_entrypoint_${ENTRYPOINT_CONF_VERSION}
    file: entrypoint.sh.tmpl
    template_driver: golang
-  homeserver_yaml:
-    name: ${STACK_NAME}_homserver_yaml_${HOMESERVER_YAML_VERSION}
-    file: homeserver.yaml.tmpl
-    template_driver: golang
-  log_config:
-    name: ${STACK_NAME}_log_config_${LOG_CONFIG_VERSION}
-    file: log.config.tmpl
-    template_driver: golang
-
-secrets:
-  db_password:
-    external: true
-    name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
-  registration_shared_secret:
-    external: true
-    name: ${STACK_NAME}_db_password_${SECRET_REGISTRATION_SHARED_SECRET_VERSION}
-  macaroon_secret_key:
-    external: true
-    name: ${STACK_NAME}_db_password_${SECRET_MACAROON_SECRET_KEY_VERSION}
-  form_secret:
-    external: true
-    name: ${STACK_NAME}_db_password_${SECRET_FORM_SECRET_VERSION}
--- a/discord_bridge.yaml.tmpl
+++ b/discord_bridge.yaml.tmpl
@ -1,123 +0,0 @@
-bridge:
-  # Domain part of the bridge, e.g. matrix.org
-  domain: "{{ env "HOMESERVER_DOMAIN" }}"
-  # This should be your publicly-facing URL because Discord may use it to
-  # fetch media from the media store.
-  homeserverUrl: "{{ env "HOMESERVER_URL" }}"
-  # The TCP port on which the appservice runs on.
-  port: 9005
-  # Interval at which to process users in the 'presence queue'. If you have
-  # 5 users, one user will be processed every 500 milliseconds according to the
-  # value below. This has a minimum value of 250.
-  # WARNING: This has a high chance of spamming the homeserver with presence
-  # updates since it will send one each time somebody changes state or is online.
-  presenceInterval: 500
-  # Disable setting presence for 'ghost users' which means Discord users on Matrix
-  # will not be shown as away or online.
-  disablePresence: false
-  # Disable sending typing notifications when somebody on Discord types.
-  disableTypingNotifications: false
-  # Disable deleting messages on Discord if a message is redacted on Matrix.
-  disableDeletionForwarding: false
-  # Disable portal bridging, where Matrix users can search for unbridged Discord
-  # rooms on their Matrix server.
-  disablePortalBridging: false
-  # Enable users to bridge rooms using !discord commands. See
-  # https://t2bot.io/discord for instructions.
-  enableSelfServiceBridging: true
-  # Disable sending of read receipts for Matrix events which have been
-  # successfully bridged to Discord.
-  disableReadReceipts: false
-  # Disable Join Leave echos from matrix
-  disableJoinLeaveNotifications: false
-  # Disable Invite echos from matrix
-  disableInviteNotifications: false
-  # Auto-determine the language of code blocks (this can be CPU-intensive)
-  determineCodeLanguage: false
-  # MXID of an admin user that will be PMd if the bridge experiences problems. Optional
-  adminMxid: '{{ env "DISCORD_BRIDGE_ADMIN" }}'
-  # The message to send to the bridge admin if the Discord token is not valid
-  invalidTokenMessage: 'Your Discord bot token seems to be invalid, and the bridge cannot function. Please update it in your bridge settings and restart the bridge'
-
-# Authentication configuration for the discord bot.
-auth:
-  # This MUST be a string (wrapped in quotes)
-  clientID: "{{ env "DISCORD_CLIENT_ID" }}"
-  botToken: "{{ secret "discord_bot_token" }}"
-  # You must enable "Privileged Gateway Intents" in your bot settings on discord.com (e.g. https://discord.com/developers/applications/12345/bot)
-  # for this to work
-  usePrivilegedIntents: false
-
-logging:
-  # What level should the logger output to the console at.
-  console: "warn" #silly, verbose, info, http, warn, error, silent
-  lineDateFormat: "MMM-D HH:mm:ss.SSS" # This is in moment.js format
-  files:
-    - file: "debug.log"
-      disable:
-        - "PresenceHandler" # Will not capture presence logging
-    - file: "warn.log" # Will capture warnings
-      level: "warn"
-    - file: "botlogs.log" # Will capture logs from DiscordBot
-      level: "info"
-      enable:
-        - "DiscordBot"
-
-database:
-  # You may either use SQLite or Postgresql for the bridge database, which contains
-  # important mappings for events and user puppeting configurations.
-  # Use the filename option for SQLite, or connString for Postgresql.
-  # If you are migrating, see https://github.com/Half-Shot/matrix-appservice-discord/blob/master/docs/howto.md#migrate-to-postgres-from-sqlite
-  # WARNING: You will almost certainly be fine with sqlite unless your bridge
-  # is in heavy demand and you suffer from IO slowness.
-  connString: "postgres://discordbridge:{{ secret "discord_db_password" }}@discorddb/discordbridge"
-
-room:
-  # Set the default visibility of alias rooms, defaults to "public".
-  # One of: "public", "private"
-  defaultVisibility: "public"
-
-channel:
-    # Pattern of the name given to bridged rooms.
-    # Can use :guild for the guild name and :name for the channel name.
-    namePattern: "[Discord] :guild :name"
-    # Changes made to rooms when a channel is deleted.
-    deleteOptions:
-       # Prefix the room name with a string.
-       #namePrefix: "[Deleted]"
-       # Prefix the room topic with a string.
-       #topicPrefix: "This room has been deleted"
-       # Disable people from talking in the room by raising the event PL to 50
-       disableMessaging: false
-       # Remove the discord alias from the room.
-       unsetRoomAlias: true
-       # Remove the room from the directory.
-       unlistFromDirectory: true
-       # Set the room to be unavailable for joining without an invite.
-       setInviteOnly: true
-       # Make all the discord users leave the room.
-       ghostsLeave: true
-
-limits:
-    # Delay in milliseconds between discord users joining a room.
-    roomGhostJoinDelay: 6000
-    # Lock timeout in milliseconds before sending messages to discord to avoid
-    # echos. Default is rather high as the lock will most likely time out
-    # before anyways.
-    # echos = (Copies of a sent message may arrive from discord before we've
-    # fininished handling it, causing us to echo it back to the room)
-    discordSendDelay: 1500
-    # Set a maximum of rooms to be bridged.
-    # roomCount: 20
-
-ghosts:
-    # Pattern for the ghosts nick, available is :nick, :username, :tag and :id
-    nickPattern: ":nick"
-    # Pattern for the ghosts username, available is :username, :tag and :id
-    usernamePattern: ":username#:tag"
-
-# Prometheus-compatible metrics endpoint
-metrics:
-    enable: false
-    port: 9001
-    host: "127.0.0.1"
--- a/entrypoint.sh.tmpl
+++ b/entrypoint.sh.tmpl
@ -1,11 +1,18 @@
 #!/bin/bash

-# https://github.com/matrix-org/synapse/tree/develop/docker#running-synapse
-# default user permissions for the synapse user
-chown 991:991 /data
+if [[ ! -f /data/homeserver.yaml ]]; then
+	/start.py generate

-if [[ ! -f /data/{{ env "DOMAIN" }}.signing.key ]]; then
-    /start.py generate
+	apt update && apt install -y wget
+	wget https://github.com/mikefarah/yq/releases/download/3.3.2/yq_linux_amd64 && \
+		chmod +x yq_linux_amd64 && \
+		mv yq_linux_amd64 /bin/yq
+
+	# turn (https://github.com/matrix-org/synapse/blob/master/docs/turn-howto.md#synapse-setup)
+	yq w -i /data/homeserver.yaml turn_uris "[]"
+	yq w -i /data/homeserver.yaml turn_uris\[0\] "turn:${TURN_SERVER}:${TURN_PORT}?transport=udp"
+	yq w -i /data/homeserver.yaml turn_uris\[1\] "turn:${TURN_SERVER}:${TURN_PORT}?transport=tcp"
+	yq w -i /data/homeserver.yaml coturn_shared_secret "$(tr -d \"\n\" < /run/secrets/coturn_shared_secret)"
 fi

 /start.py
--- a/gen.sh
+++ b/gen.sh
@ -0,0 +1,6 @@
+secret="screw\$naval5seem!herb" && \
+time=$(date +%s) && \
+expiry=8400 && \
+username=$(( $time + $expiry )) &&\
+echo username:$username && \
+echo password : $(echo -n $username | openssl dgst -binary -sha1 -hmac $secret | openssl base64)
--- a/homeserver.yaml.tmpl
+++ b/homeserver.yaml.tmpl
--- a/log.config.tmpl
+++ b/log.config.tmpl
@ -1,20 +0,0 @@
-version: 1
-
-formatters:
-  precise:
-    format: '%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s'
-
-handlers:
-  console:
-    class: logging.StreamHandler
-    formatter: precise
-
-loggers:
-    synapse.storage.SQL:
-      level: {{ env "SQL_LOG_LEVEL" }}
-
-root:
-    level: {{ env "ROOT_LOG_LEVEL" }}
-    handlers: [console]
-
-disable_existing_loggers: false
--- a/release/1.3.0+v1.55.2
+++ b/release/1.3.0+v1.55.2
@ -1,6 +0,0 @@
-The deployment failed due to the app/db getting confused. I think this is just
-due to the recipe not having good healthcheck config. After the app container
-flapped a bit, everything came up nicely. d1 @ autonomic co-op.
-
-Same thing happened to me when deploying this for another instance. Also d1 @
-autonomic co-op.
--- a/release/2.0.0+v1.58.1
+++ b/release/2.0.0+v1.58.1
@ -1,9 +0,0 @@
-This upgrade adds new env variables for homeserver.yml, please add them to your .env file:
-
-```
-ENCRYPTED_BY_DEFAULT=all
-SERVE_SERVER_WELLKNOWN=false
-
-#KEYCLOAK_ID=keycloak
-#KEYCLOAK_ALLOW_EXISTING_USERS=false
-```
--- a/release/2.1.0+v1.62.0
+++ b/release/2.1.0+v1.62.0
@ -1,5 +0,0 @@
-The only release note worthy point for this release is: if you're using the
-horrendous `compose.keycloak2.yml` (as creator of this horrible hack, I am
-allowed to call it horrendous ;)), you will need to re-check the new
-~/.abra/recipes/matrix-synapse/.env.sample, there are some new default env vars
-which you'll have to add in (e.g. KEYCLOAK2_ID=...).
--- a/telegram_bridge.yaml.tmpl
+++ b/telegram_bridge.yaml.tmpl
@ -1,547 +0,0 @@
-# Homeserver details
-homeserver:
-    # The address that this appservice can use to connect to the homeserver.
-    address: {{ env "HOMESERVER_URL" }}
-    # The domain of the homeserver (for MXIDs, etc).
-    domain: {{ env "HOMESERVER_DOMAIN" }}
-    # Whether or not to verify the SSL certificate of the homeserver.
-    # Only applies if address starts with https://
-    verify_ssl: {{ env "VERIFY_SSL" }}
-    asmux: false
-    # Number of retries for all HTTP requests if the homeserver isn't reachable.
-    http_retry_count: 4
-    # The URL to push real-time bridge status to.
-    # If set, the bridge will make POST requests to this URL whenever a user's Telegram connection state changes.
-    # The bridge will use the appservice as_token to authorize requests.
-    status_endpoint: null
-    # Endpoint for reporting per-message status.
-    message_send_checkpoint_endpoint: null
-    # Whether asynchronous uploads via MSC2246 should be enabled for media.
-    # Requires a media repo that supports MSC2246.
-    async_media: false
-
-# Application service host/registration related details
-# Changing these values requires regeneration of the registration.
-appservice:
-    # The address that the homeserver can use to connect to this appservice.
-    address: http://telegrambridge:29317
-    # When using https:// the TLS certificate and key files for the address.
-    tls_cert: false
-    tls_key: false
-
-    # The hostname and port where this appservice should listen.
-    hostname: 0.0.0.0
-    port: 29317
-    # The maximum body size of appservice API requests (from the homeserver) in mebibytes
-    # Usually 1 is enough, but on high-traffic bridges you might need to increase this to avoid 413s
-    max_body_size: 1
-
-    # The full URI to the database. SQLite and Postgres are supported.
-    # Format examples:
-    #   SQLite:   sqlite:///filename.db
-    #   Postgres: postgres://username:password@hostname/dbname
-    database: postgres://telegrambridge:{{ secret "telegram_db_password" }}@telegramdb/telegrambridge
-    # Additional arguments for asyncpg.create_pool() or sqlite3.connect()
-    # https://magicstack.github.io/asyncpg/current/api/index.html#asyncpg.pool.create_pool
-    # https://docs.python.org/3/library/sqlite3.html#sqlite3.connect
-    # For sqlite, min_size is used as the connection thread pool size and max_size is ignored.
-    database_opts:
-        min_size: 1
-        max_size: 10
-
-    # Public part of web server for out-of-Matrix interaction with the bridge.
-    # Used for things like login if the user wants to make sure the 2FA password isn't stored in
-    # the HS database.
-    public:
-        # Whether or not the public-facing endpoints should be enabled.
-        enabled: false
-        # The prefix to use in the public-facing endpoints.
-        prefix: /public
-        # The base URL where the public-facing endpoints are available. The prefix is not added
-        # implicitly.
-        external: https://example.com/public
-
-    # Provisioning API part of the web server for automated portal creation and fetching information.
-    # Used by things like mautrix-manager (https://github.com/tulir/mautrix-manager).
-    provisioning:
-        # Whether or not the provisioning API should be enabled.
-        enabled: false
-        # The prefix to use in the provisioning API endpoints.
-        prefix: /_matrix/provision
-        # The shared secret to authorize users of the API.
-        # Set to "generate" to generate and save a new token.
-        shared_secret: generate
-
-    # The unique ID of this appservice.
-    id: {{ env "APP_SERVICE_ID" }}
-    # Username of the appservice bot.
-    bot_username: {{ env "APP_SERVICE_BOT_USERNAME" }}
-    # Display name and avatar for bot. Set to "remove" to remove display name/avatar, leave empty
-    # to leave display name/avatar as-is.
-    bot_displayname: {{ env "APP_SERVICE_DISPLAY_NAME" }}
-    bot_avatar: mxc://maunium.net/tJCRmUyJDsgRNgqhOgoiHWbX
-
-    # Whether or not to receive ephemeral events via appservice transactions.
-    # Requires MSC2409 support (i.e. Synapse 1.22+).
-    # You should disable bridge -> sync_with_custom_puppets when this is enabled.
-    ephemeral_events: false
-
-    # Authentication tokens for AS <-> HS communication. Autogenerated; do not modify.
-    as_token: "{{ secret "telegram_as_token" }}"
-    hs_token: "{{ secret "telegram_hs_token" }}"
-
-# Prometheus telemetry config. Requires prometheus-client to be installed.
-metrics:
-    enabled: false
-    listen_port: 8000
-
-# Manhole config.
-manhole:
-    # Whether or not opening the manhole is allowed.
-    enabled: false
-    # The path for the unix socket.
-    path: /var/tmp/mautrix-telegram.manhole
-    # The list of UIDs who can be added to the whitelist.
-    # If empty, any UIDs can be specified in the open-manhole command.
-    whitelist:
-    - 0
-
-# Bridge config
-bridge:
-    # Localpart template of MXIDs for Telegram users.
-    # {userid} is replaced with the user ID of the Telegram user.
-    username_template: "telegram_{userid}"
-    # Localpart template of room aliases for Telegram portal rooms.
-    # {groupname} is replaced with the name part of the public channel/group invite link ( https://t.me/{} )
-    alias_template: "telegram_{groupname}"
-    # Displayname template for Telegram users.
-    # {displayname} is replaced with the display name of the Telegram user.
-    displayname_template: "{displayname} (Telegram)"
-
-    # Set the preferred order of user identifiers which to use in the Matrix puppet display name.
-    # In the (hopefully unlikely) scenario that none of the given keys are found, the numeric user
-    # ID is used.
-    #
-    # If the bridge is working properly, a phone number or an username should always be known, but
-    # the other one can very well be empty.
-    #
-    # Valid keys:
-    #   "full name"          (First and/or last name)
-    #   "full name reversed" (Last and/or first name)
-    #   "first name"
-    #   "last name"
-    #   "username"
-    #   "phone number"
-    displayname_preference:
-    - full name
-    - username
-    - phone number
-    # Maximum length of displayname
-    displayname_max_length: 100
-    # Remove avatars from Telegram ghost users when removed on Telegram. This is disabled by default
-    # as there's no way to determine whether an avatar is removed or just hidden from some users. If
-    # you're on a single-user instance, this should be safe to enable.
-    allow_avatar_remove: false
-
-    # Maximum number of members to sync per portal when starting up. Other members will be
-    # synced when they send messages. The maximum is 10000, after which the Telegram server
-    # will not send any more members.
-    # -1 means no limit (which means it's limited to 10000 by the server)
-    max_initial_member_sync: 100
-    # Whether or not to sync the member list in channels.
-    # If no channel admins have logged into the bridge, the bridge won't be able to sync the member
-    # list regardless of this setting.
-    sync_channel_members: true
-    # Whether or not to skip deleted members when syncing members.
-    skip_deleted_members: true
-    # Whether or not to automatically synchronize contacts and chats of Matrix users logged into
-    # their Telegram account at startup.
-    startup_sync: true
-    # Number of most recently active dialogs to check when syncing chats.
-    # Set to 0 to remove limit.
-    sync_update_limit: 0
-    # Number of most recently active dialogs to create portals for when syncing chats.
-    # Set to 0 to remove limit.
-    sync_create_limit: 30
-    # Whether or not to sync and create portals for direct chats at startup.
-    sync_direct_chats: false
-    # The maximum number of simultaneous Telegram deletions to handle.
-    # A large number of simultaneous redactions could put strain on your homeserver.
-    max_telegram_delete: 10
-    # Whether or not to automatically sync the Matrix room state (mostly unpuppeted displaynames)
-    # at startup and when creating a bridge.
-    sync_matrix_state: true
-    # Allow logging in within Matrix. If false, users can only log in using login-qr or the
-    # out-of-Matrix login website (see appservice.public config section)
-    allow_matrix_login: true
-    # Whether or not to bridge plaintext highlights.
-    # Only enable this if your displayname_template has some static part that the bridge can use to
-    # reliably identify what is a plaintext highlight.
-    plaintext_highlights: false
-    # Whether or not to make portals of publicly joinable channels/supergroups publicly joinable on Matrix.
-    public_portals: true
-    # Whether or not to use /sync to get presence, read receipts and typing notifications
-    # when double puppeting is enabled
-    sync_with_custom_puppets: true
-    # Whether or not to update the m.direct account data event when double puppeting is enabled.
-    # Note that updating the m.direct event is not atomic (except with mautrix-asmux)
-    # and is therefore prone to race conditions.
-    sync_direct_chat_list: false
-    # Servers to always allow double puppeting from
-    double_puppet_server_map:
-        example.com: https://example.com
-    # Allow using double puppeting from any server with a valid client .well-known file.
-    double_puppet_allow_discovery: false
-    # Shared secrets for https://github.com/devture/matrix-synapse-shared-secret-auth
-    #
-    # If set, custom puppets will be enabled automatically for local users
-    # instead of users having to find an access token and run `login-matrix`
-    # manually.
-    # If using this for other servers than the bridge's server,
-    # you must also set the URL in the double_puppet_server_map.
-    login_shared_secret_map:
-        example.com: foobar
-    # Set to false to disable link previews in messages sent to Telegram.
-    telegram_link_preview: true
-    # Whether or not the !tg join command should do a HTTP request
-    # to resolve redirects in invite links.
-    invite_link_resolve: false
-    # Use inline images instead of a separate message for the caption.
-    # N.B. Inline images are not supported on all clients (e.g. Element iOS/Android).
-    inline_images: false
-    # Maximum size of image in megabytes before sending to Telegram as a document.
-    image_as_file_size: 10
-    # Maximum number of pixels in an image before sending to Telegram as a document. Defaults to 1280x1280 = 1638400.
-    image_as_file_pixels: 1638400
-    # Enable experimental parallel file transfer, which makes uploads/downloads much faster by
-    # streaming from/to Matrix and using many connections for Telegram.
-    # Note that generating HQ thumbnails for videos is not possible with streamed transfers.
-    # This option uses internal Telethon implementation details and may break with minor updates.
-    parallel_file_transfer: false
-    # Whether or not created rooms should have federation enabled.
-    # If false, created portal rooms will never be federated.
-    federate_rooms: true
-    # Settings for converting animated stickers.
-    animated_sticker:
-        # Format to which animated stickers should be converted.
-        # disable - No conversion, send as-is (gzipped lottie)
-        # png - converts to non-animated png (fastest),
-        # gif - converts to animated gif
-        # webm - converts to webm video, requires ffmpeg executable with vp9 codec and webm container support
-        target: gif
-        # Arguments for converter. All converters take width and height.
-        args:
-            width: 256
-            height: 256
-            fps: 25 # only for webm and gif (2, 5, 10, 20 or 25 recommended)
-    # End-to-bridge encryption support options.
-    #
-    # See https://docs.mau.fi/bridges/general/end-to-bridge-encryption.html for more info.
-    encryption:
-        # Allow encryption, work in group chat rooms with e2ee enabled
-        allow: {{ env "ENABLE_ENCRYPTION" }}
-        # Default to encryption, force-enable encryption in all portals the bridge creates
-        # This will cause the bridge bot to be in private chats for the encryption to work properly.
-        default: false
-        # Database for the encryption data. If set to `default`, will use the appservice database.
-        database: default
-        # Options for automatic key sharing.
-        key_sharing:
-            # Enable key sharing? If enabled, key requests for rooms where users are in will be fulfilled.
-            # You must use a client that supports requesting keys from other users to use this feature.
-            allow: false
-            # Require the requesting device to have a valid cross-signing signature?
-            # This doesn't require that the bridge has verified the device, only that the user has verified it.
-            # Not yet implemented.
-            require_cross_signing: false
-            # Require devices to be verified by the bridge?
-            # Verification by the bridge is not yet implemented.
-            require_verification: false
-    # Whether or not to explicitly set the avatar and room name for private
-    # chat portal rooms. This will be implicitly enabled if encryption.default is true.
-    private_chat_portal_meta: false
-    # Whether or not the bridge should send a read receipt from the bridge bot when a message has
-    # been sent to Telegram.
-    delivery_receipts: false
-    # Whether or not delivery errors should be reported as messages in the Matrix room.
-    delivery_error_reports: false
-    # Set this to true to tell the bridge to re-send m.bridge events to all rooms on the next run.
-    # This field will automatically be changed back to false after it,
-    # except if the config file is not writable.
-    resend_bridge_info: false
-    # When using double puppeting, should muted chats be muted in Matrix?
-    mute_bridging: false
-    # When using double puppeting, should pinned chats be moved to a specific tag in Matrix?
-    # The favorites tag is `m.favourite`.
-    pinned_tag: null
-    # Same as above for archived chats, the low priority tag is `m.lowpriority`.
-    archive_tag: null
-    # Whether or not mute status and tags should only be bridged when the portal room is created.
-    tag_only_on_create: true
-    # Should leaving the room on Matrix make the user leave on Telegram?
-    bridge_matrix_leave: true
-    # Should the user be kicked out of all portals when logging out of the bridge?
-    kick_on_logout: true
-    # Should the "* user joined Telegram" notice always be marked as read automatically?
-    always_read_joined_telegram_notice: true
-    # Settings for backfilling messages from Telegram.
-    backfill:
-        # Whether or not the Telegram ghosts of logged in Matrix users should be
-        # invited to private chats when backfilling history from Telegram. This is
-        # usually needed to prevent rate limits and to allow timestamp massaging.
-        invite_own_puppet: true
-        # Maximum number of messages to backfill without using a takeout.
-        # The first time a takeout is used, the user has to manually approve it from a different
-        # device. If initial_limit or missed_limit are higher than this value, the bridge will ask
-        # the user to accept the takeout after logging in before syncing any chats.
-        takeout_limit: 100
-        # Maximum number of messages to backfill initially.
-        # Set to 0 to disable backfilling when creating portal, or -1 to disable the limit.
-        #
-        # N.B. Initial backfill will only start after member sync. Make sure your
-        #      max_initial_member_sync is set to a low enough value so it doesn't take forever.
-        initial_limit: 0
-        # Maximum number of messages to backfill if messages were missed while the bridge was
-        # disconnected. Note that this only works for logged in users and only if the chat isn't
-        # older than sync_update_limit
-        # Set to 0 to disable backfilling missed messages.
-        missed_limit: 50
-        # If using double puppeting, should notifications be disabled
-        # while the initial backfill is in progress?
-        disable_notifications: false
-        # Whether or not to enable backfilling in normal groups.
-        # Normal groups have numerous technical problems in Telegram, and backfilling normal groups
-        # will likely cause problems if there are multiple Matrix users in the group.
-        normal_groups: false
-
-    # Overrides for base power levels.
-    initial_power_level_overrides:
-        user: {}
-        group: {}
-
-    # Whether to bridge Telegram bot messages as m.notices or m.texts.
-    bot_messages_as_notices: true
-    bridge_notices:
-        # Whether or not Matrix bot messages (type m.notice) should be bridged.
-        default: false
-        # List of user IDs for whom the previous flag is flipped.
-        # e.g. if bridge_notices.default is false, notices from other users will not be bridged, but
-        #      notices from users listed here will be bridged.
-        exceptions: []
-
-    # An array of possible values for the $distinguisher variable in message formats.
-    # Each user gets one of the values here, based on a hash of their user ID.
-    # If the array is empty, the $distinguisher variable will also be empty.
-    relay_user_distinguishers: ["🟦", "🟣", "🟩", "⭕️", "🔶", "⬛️", "🔵", "🟢"]
-    # The formats to use when sending messages to Telegram via the relay bot.
-    # Text msgtypes (m.text, m.notice and m.emote) support HTML, media msgtypes don't.
-    #
-    # Available variables:
-    #   $sender_displayname - The display name of the sender (e.g. Example User)
-    #   $sender_username    - The username (Matrix ID localpart) of the sender (e.g. exampleuser)
-    #   $sender_mxid        - The Matrix ID of the sender (e.g. @exampleuser:example.com)
-    #   $distinguisher      - A random string from the options in the relay_user_distinguishers array.
-    #   $message            - The message content
-    message_formats:
-        m.text: "$distinguisher <b>$sender_displayname</b>: $message"
-        m.notice: "$distinguisher <b>$sender_displayname</b>: $message"
-        m.emote: "* $distinguisher <b>$sender_displayname</b> $message"
-        m.file: "$distinguisher <b>$sender_displayname</b> sent a file: $message"
-        m.image: "$distinguisher <b>$sender_displayname</b> sent an image: $message"
-        m.audio: "$distinguisher <b>$sender_displayname</b> sent an audio file: $message"
-        m.video: "$distinguisher <b>$sender_displayname</b> sent a video: $message"
-        m.location: "$distinguisher <b>$sender_displayname</b> sent a location: $message"
-    # Telegram doesn't have built-in emotes, this field specifies how m.emote's from authenticated
-    # users are sent to telegram. All fields in message_formats are supported. Additionally, the
-    # Telegram user info is available in the following variables:
-    #    $displayname - Telegram displayname
-    #    $username    - Telegram username (may not exist)
-    #    $mention     - Telegram @username or displayname mention (depending on which exists)
-    emote_format: "* $mention $formatted_body"
-
-    # The formats to use when sending state events to Telegram via the relay bot.
-    #
-    # Variables from `message_formats` that have the `sender_` prefix are available without the prefix.
-    # In name_change events, `$prev_displayname` is the previous displayname.
-    #
-    # Set format to an empty string to disable the messages for that event.
-    state_event_formats:
-        join: "$distinguisher <b>$displayname</b> joined the room."
-        leave: "$distinguisher <b>$displayname</b> left the room."
-        name_change: "$distinguisher <b>$prev_displayname</b> changed their name to $distinguisher <b>$displayname</b>"
-
-    # Filter rooms that can/can't be bridged. Can also be managed using the `filter` and
-    # `filter-mode` management commands.
-    #
-    # Filters do not affect direct chats.
-    # An empty blacklist will essentially disable the filter.
-    filter:
-        # Filter mode to use. Either "blacklist" or "whitelist".
-        # If the mode is "blacklist", the listed chats will never be bridged.
-        # If the mode is "whitelist", only the listed chats can be bridged.
-        mode: blacklist
-        # The list of group/channel IDs to filter.
-        list: []
-
-    # The prefix for commands. Only required in non-management rooms.
-    command_prefix: "!tg"
-
-    # Messages sent upon joining a management room.
-    # Markdown is supported. The defaults are listed below.
-    management_room_text:
-        # Sent when joining a room.
-        welcome: "Hello, I'm a Telegram bridge bot."
-        # Sent when joining a management room and the user is already logged in.
-        welcome_connected: "Use `help` for help."
-        # Sent when joining a management room and the user is not logged in.
-        welcome_unconnected: "Use `help` for help or `login` to log in."
-        # Optional extra text sent when joining a management room.
-        additional_help: ""
-
-    # Send each message separately (for readability in some clients)
-    management_room_multiple_messages: false
-
-    # Permissions for using the bridge.
-    # Permitted values:
-    #   relaybot - Only use the bridge via the relaybot, no access to commands.
-    #       user - Relaybot level + access to commands to create bridges.
-    #  puppeting - User level + logging in with a Telegram account.
-    #       full - Full access to use the bridge, i.e. previous levels + Matrix login.
-    #      admin - Full access to use the bridge and some extra administration commands.
-    # Permitted keys:
-    #        * - All Matrix users
-    #   domain - All users on that homeserver
-    #     mxid - Specific user
-    permissions:
-        "*": "relaybot"
-        "{{ env "TELEGRAM_BRIDGE_ADMIN_1" }}": "admin"
-        "{{ env "TELEGRAM_BRIDGE_ADMIN_2" }}": "admin"
-
-    # Options related to the message relay Telegram bot.
-    relaybot:
-        private_chat:
-            # List of users to invite to the portal when someone starts a private chat with the bot.
-            # If empty, private chats with the bot won't create a portal.
-            invite: []
-            # Whether or not to bridge state change messages in relaybot private chats.
-            state_changes: true
-            # When private_chat_invite is empty, this message is sent to users /starting the
-            # relaybot. Telegram's "markdown" is supported.
-            message: This is a Matrix bridge relaybot and does not support direct chats
-        # List of users to invite to all group chat portals created by the bridge.
-        group_chat_invite: []
-        # Whether or not the relaybot should not bridge events in unbridged group chats.
-        # If false, portals will be created when the relaybot receives messages, just like normal
-        # users. This behavior is usually not desirable, as it interferes with manually bridging
-        # the chat to another room.
-        ignore_unbridged_group_chat: true
-        # Whether or not to allow creating portals from Telegram.
-        authless_portals: true
-        # Whether or not to allow Telegram group admins to use the bot commands.
-        whitelist_group_admins: true
-        # Whether or not to ignore incoming events sent by the relay bot.
-        ignore_own_incoming_events: true
-        # List of usernames/user IDs who are also allowed to use the bot commands.
-        whitelist:
-        - myusername
-        - 12345678
-
-# Telegram config
-telegram:
-    # Get your own API keys at https://my.telegram.org/apps
-    api_id: {{ env "TELEGRAM_APP_ID" }}
-    api_hash: {{ secret "telegram_api_hash" }}
-    # (Optional) Create your own bot at https://t.me/BotFather
-    bot_token: {{ secret "telegram_bot_token" }}
-
-    # Telethon connection options.
-    connection:
-        # The timeout in seconds to be used when connecting.
-        timeout: 120
-        # How many times the reconnection should retry, either on the initial connection or when
-        # Telegram disconnects us. May be set to a negative or null value for infinite retries, but
-        # this is not recommended, since the program can get stuck in an infinite loop.
-        retries: 5
-        # The delay in seconds to sleep between automatic reconnections.
-        retry_delay: 1
-        # The threshold below which the library should automatically sleep on flood wait errors
-        # (inclusive). For instance, if a FloodWaitError for 17s occurs and flood_sleep_threshold
-        # is 20s, the library will sleep automatically. If the error was for 21s, it would raise
-        # the error instead. Values larger than a day (86400) will be changed to a day.
-        flood_sleep_threshold: 60
-        # How many times a request should be retried. Request are retried when Telegram is having
-        # internal issues, when there is a FloodWaitError less than flood_sleep_threshold, or when
-        # there's a migrate error. May take a negative or null value for infinite retries, but this
-        # is not recommended, since some requests can always trigger a call fail (such as searching
-        # for messages).
-        request_retries: 5
-
-    # Device info sent to Telegram.
-    device_info:
-        # "auto" = OS name+version.
-        device_model: auto
-        # "auto" = Telethon version.
-        system_version: auto
-        # "auto" = mautrix-telegram version.
-        app_version: auto
-        lang_code: en
-        system_lang_code: en
-
-    # Custom server to connect to.
-    server:
-        # Set to true to use these server settings. If false, will automatically
-        # use production server assigned by Telegram. Set to false in production.
-        enabled: false
-        # The DC ID to connect to.
-        dc: 2
-        # The IP to connect to.
-        ip: 149.154.167.40
-        # The port to connect to. 443 may not work, 80 is better and both are equally secure.
-        port: 80
-
-    # Telethon proxy configuration.
-    # You must install PySocks from pip for proxies to work.
-    proxy:
-        # Allowed types: disabled, socks4, socks5, http, mtproxy
-        type: disabled
-        # Proxy IP address and port.
-        address: 127.0.0.1
-        port: 1080
-        # Whether or not to perform DNS resolving remotely. Only for socks/http proxies.
-        rdns: true
-        # Proxy authentication (optional). Put MTProxy secret in password field.
-        username: ""
-        password: ""
-
-# Python logging configuration.
-#
-# See section 16.7.2 of the Python documentation for more info:
-# https://docs.python.org/3.6/library/logging.config.html#configuration-dictionary-schema
-logging:
-    version: 1
-    formatters:
-        colored:
-            (): mautrix_telegram.util.ColorFormatter
-            format: "[%(asctime)s] [%(levelname)s@%(name)s] %(message)s"
-        normal:
-            format: "[%(asctime)s] [%(levelname)s@%(name)s] %(message)s"
-    handlers:
-        file:
-            class: logging.handlers.RotatingFileHandler
-            formatter: normal
-            filename: /data/mautrix-telegram.log
-            maxBytes: 10485760
-            backupCount: 10
-        console:
-            class: logging.StreamHandler
-            formatter: colored
-    loggers:
-        mau:
-            level: DEBUG
-        telethon:
-            level: INFO
-        aiohttp:
-            level: INFO
-    root:
-        level: DEBUG
-        handlers: [file, console]
--- a/turnserver.conf.tmpl
+++ b/turnserver.conf.tmpl
@ -0,0 +1,15 @@
+use-auth-secret
+static-auth-secret={{ secret "coturn_shared_secret" }}
+realm=turn.{{ env "DOMAIN" }}
+
+log-file=stdout
+pidfile=/var/tmp/turnserver.pid
+userdb=/var/tmp/turnserver.db
+
+no-cli
+
+no-tls
+no-dtls
+
+prod
+no-tcp-relay
Author	SHA1	Message	Date
3wc	e9f84f8fd8	Pin docker image tag	2021-04-03 14:38:46 +02:00
3wc	ef719bcee4	Update for COTURN	2020-10-29 19:45:42 +02:00
3wc	309122240a	SERVICE -> APP	2020-10-29 19:42:05 +02:00
3wc	fd3c7a606a	Rejig .envrc.sample [ci skip]	2020-10-06 01:52:00 +02:00
3wc	ad6a1c87dd	Simplify set-up using custom abra command	2020-09-11 18:14:16 +02:00
3wc	cfbd809761	Working(?) TURN server	2020-09-11 18:14:02 +02:00
3wc	2d78fff08f	Add initial coturn server	2020-09-11 00:10:21 +02:00