Compare commits

...

12 Commits

7 changed files with 18 additions and 9 deletions

View File

@ -48,6 +48,9 @@ ENCRYPTED_BY_DEFAULT=all
#ENABLE_ALLOWLIST=1 #ENABLE_ALLOWLIST=1
#FEDERATION_ALLOWLIST="[]" #FEDERATION_ALLOWLIST="[]"
# Set these to keyservers you trust - usually the same as your federation allowlist
#TRUSTED_KEYSERVERS="trusted_key_servers:\n - server_name: 'example.com'\n - server_name: 'example2.com'"
## Retention ## Retention
ALLOWED_LIFETIME_MAX=4w ALLOWED_LIFETIME_MAX=4w
@ -116,6 +119,7 @@ RETENTION_MAX_LIFETIME=4w
#ENABLE_ENCRYPTION=true #ENABLE_ENCRYPTION=true
#TELEGRAM_APP_ID= #TELEGRAM_APP_ID=
#TELEGRAM_BRIDGE_PERMISSIONS="{ \"*\": \"relaybot\" }" #TELEGRAM_BRIDGE_PERMISSIONS="{ \"*\": \"relaybot\" }"
#TELEGRAM_SYNC_CHANNEL_MEMBERS=true
#SECRET_TELEGRAM_DB_PASSWORD_VERSION=v1 #SECRET_TELEGRAM_DB_PASSWORD_VERSION=v1
#SECRET_TELEGRAM_API_HASH_VERSION=v1 #SECRET_TELEGRAM_API_HASH_VERSION=v1
#SECRET_TELEGRAM_BOT_TOKEN_VERSION=v1 #SECRET_TELEGRAM_BOT_TOKEN_VERSION=v1

View File

@ -1,7 +1,7 @@
export DISCORD_BRIDGE_YAML_VERSION=v2 export DISCORD_BRIDGE_YAML_VERSION=v2
export ENTRYPOINT_CONF_VERSION=v1 export ENTRYPOINT_CONF_VERSION=v1
export HOMESERVER_YAML_VERSION=v18 export HOMESERVER_YAML_VERSION=v22
export LOG_CONFIG_VERSION=v2 export LOG_CONFIG_VERSION=v2
export SHARED_SECRET_AUTH_VERSION=v1 export SHARED_SECRET_AUTH_VERSION=v1
export SIGNAL_BRIDGE_YAML_VERSION=v4 export SIGNAL_BRIDGE_YAML_VERSION=v4
export TELEGRAM_BRIDGE_YAML_VERSION=v5 export TELEGRAM_BRIDGE_YAML_VERSION=v6

View File

@ -17,7 +17,7 @@ services:
- signald-data:/signald - signald-data:/signald
signalbridge: signalbridge:
image: dock.mau.dev/mautrix/signal:v0.4.2 image: dock.mau.dev/mautrix/signal:v0.4.3
depends_on: depends_on:
- signaldb - signaldb
configs: configs:

View File

@ -10,7 +10,7 @@ services:
- telegram-data:/telegram-data - telegram-data:/telegram-data
telegrambridge: telegrambridge:
image: dock.mau.dev/mautrix/telegram:v0.13.0 image: dock.mau.dev/mautrix/telegram:v0.14.0
depends_on: depends_on:
- telegramdb - telegramdb
configs: configs:
@ -25,6 +25,7 @@ services:
- HOMESERVER_URL - HOMESERVER_URL
- TELEGRAM_APP_ID - TELEGRAM_APP_ID
- TELEGRAM_BRIDGE_PERMISSIONS - TELEGRAM_BRIDGE_PERMISSIONS
- TELEGRAM_SYNC_CHANNEL_MEMBERS
- VERIFY_SSL - VERIFY_SSL
secrets: secrets:
- telegram_api_hash - telegram_api_hash

View File

@ -3,7 +3,7 @@ version: "3.8"
services: services:
app: app:
image: "matrixdotorg/synapse:v1.78.0" image: "matrixdotorg/synapse:v1.84.1"
volumes: volumes:
- "data:/data" - "data:/data"
depends_on: depends_on:
@ -61,7 +61,7 @@ services:
- "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)" - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)"
- "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure" - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}" - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
- "coop-cloud.${STACK_NAME}.version=3.3.0+v1.78.0" - "coop-cloud.${STACK_NAME}.version=3.8.0+v1.84.1"
db: db:
image: postgres:13-alpine image: postgres:13-alpine

View File

@ -38,7 +38,7 @@ modules:
# lowercase and may contain an explicit port. # lowercase and may contain an explicit port.
# Examples: matrix.org, localhost:8080 # Examples: matrix.org, localhost:8080
# #
server_name: {{ env "DOMAIN" }} server_name: {{ or (env "SERVER_NAME") (env "DOMAIN") }}
# The public-facing base URL that clients use to access this Homeserver (not # The public-facing base URL that clients use to access this Homeserver (not
# including _matrix/...). This is the same URL a user might enter into the # including _matrix/...). This is the same URL a user might enter into the
@ -427,8 +427,12 @@ signing_key_path: "/data/{{ env "DOMAIN" }}.signing.key"
# "ed25519:auto": "abcdefghijklmnopqrstuvwxyzabcdefghijklmopqr" # "ed25519:auto": "abcdefghijklmnopqrstuvwxyzabcdefghijklmopqr"
# - server_name: "my_other_trusted_server.example.com" # - server_name: "my_other_trusted_server.example.com"
# #
{{ if eq (env "ENABLE_ALLOWLIST") "1" }}
{{ env "TRUSTED_KEYSERVERS" }}
{{ else }}
trusted_key_servers: trusted_key_servers:
- server_name: "matrix.org" - server_name: "matrix.org"
{{ end }}
## Single sign-on integration ## ## Single sign-on integration ##
@ -685,7 +689,7 @@ email:
# authentication is attempted. # authentication is attempted.
# #
smtp_user: {{ env "SMTP_USER" }} smtp_user: {{ env "SMTP_USER" }}
smtp_pass: {{ secret "smtp_password" }} smtp_pass: "{{ secret "smtp_password" }}"
# Uncomment the following to require TLS transport security for SMTP. # Uncomment the following to require TLS transport security for SMTP.
# By default, Synapse will connect over plain text, and will then switch to # By default, Synapse will connect over plain text, and will then switch to

View File

@ -151,7 +151,7 @@ bridge:
# Whether or not to sync the member list in channels. # 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 # If no channel admins have logged into the bridge, the bridge won't be able to sync the member
# list regardless of this setting. # list regardless of this setting.
sync_channel_members: true sync_channel_members: {{ env "TELEGRAM_SYNC_CHANNEL_MEMBERS" }}
# Whether or not to skip deleted members when syncing members. # Whether or not to skip deleted members when syncing members.
skip_deleted_members: true skip_deleted_members: true
# Whether or not to automatically synchronize contacts and chats of Matrix users logged into # Whether or not to automatically synchronize contacts and chats of Matrix users logged into