diff --git a/.env.sample b/.env.sample index aeff088..9e4765c 100644 --- a/.env.sample +++ b/.env.sample @@ -93,8 +93,7 @@ ALLOWED_LIFETIME_MAX=4w #VERIFY_SSL=false #ENABLE_ENCRYPTION=true #TELEGRAM_APP_ID= -#TELEGRAM_BRIDGE_ADMIN_1= -#TELEGRAM_BRIDGE_ADMIN_2= +TELEGRAM_BRIDGE_PERMISSIONS="{ \"*\": \"relaybot\" }" #SECRET_TELEGRAM_DB_PASSWORD_VERSION=v1 #SECRET_TELEGRAM_API_HASH_VERSION=v1 #SECRET_TELEGRAM_BOT_TOKEN_VERSION=v1 @@ -109,8 +108,7 @@ ALLOWED_LIFETIME_MAX=4w #COMPOSE_FILE="$COMPOSE_FILE:compose.signal.yml" #SIGNAL_ENABLE_ENCRYPTION=true -#SIGNAL_BRIDGE_ADMIN_1="@foo:example.com" -#SIGNAL_BRIDGE_ADMIN_2="@bar:example.com" +SIGNAL_BRIDGE_PERMISSIONS="{ \"*\": \"relay\" }" #SECRET_SIGNAL_AS_TOKEN_VERSION=v1 #SECRET_SIGNAL_DB_PASSWORD_VERSION=v1 #SECRET_SIGNAL_HS_TOKEN_VERSION=v1 diff --git a/compose.signal.yml b/compose.signal.yml index c053e5f..bce4052 100644 --- a/compose.signal.yml +++ b/compose.signal.yml @@ -26,8 +26,7 @@ services: environment: - HOMESERVER_DOMAIN - HOMESERVER_URL - - SIGNAL_BRIDGE_ADMIN_1 - - SIGNAL_BRIDGE_ADMIN_2 + - SIGNAL_BRIDGE_PERMISSIONS - SIGNAL_ENABLE_ENCRYPTION - VERIFY_SSL secrets: diff --git a/compose.telegram.yml b/compose.telegram.yml index 28a5d51..f2618fb 100644 --- a/compose.telegram.yml +++ b/compose.telegram.yml @@ -24,8 +24,7 @@ services: - HOMESERVER_DOMAIN - HOMESERVER_URL - TELEGRAM_APP_ID - - TELEGRAM_BRIDGE_ADMIN_1 - - TELEGRAM_BRIDGE_ADMIN_2 + - TELEGRAM_BRIDGE_PERMISSIONS - VERIFY_SSL secrets: - telegram_api_hash diff --git a/signal_bridge.yaml.tmpl b/signal_bridge.yaml.tmpl index c0a2e60..91000b4 100644 --- a/signal_bridge.yaml.tmpl +++ b/signal_bridge.yaml.tmpl @@ -267,10 +267,8 @@ bridge: # * - All Matrix users # domain - All users on that homeserver # mxid - Specific user - permissions: - "*": "relay" - "{{ env "SIGNAL_BRIDGE_ADMIN_1" }}": "admin" - "{{ env "SIGNAL_BRIDGE_ADMIN_2" }}": "admin" + permissions: "{{ env "SIGNAL_BRIDGE_PERMISSIONS" }}" + relay: # Whether relay mode should be allowed. If allowed, `!signal set-relay` can be used to turn any # authenticated user into a relaybot for that chat. diff --git a/telegram_bridge.yaml.tmpl b/telegram_bridge.yaml.tmpl index db350d5..5f90d39 100644 --- a/telegram_bridge.yaml.tmpl +++ b/telegram_bridge.yaml.tmpl @@ -412,10 +412,7 @@ bridge: # * - 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" + permissions: "{{ env "TELEGRAM_BRIDGE_PERMISSIONS" }}" # Options related to the message relay Telegram bot. relaybot: