diff --git a/.env.sample b/.env.sample index cff6f69..26d4375 100644 --- a/.env.sample +++ b/.env.sample @@ -74,6 +74,8 @@ ENCRYPTED_BY_DEFAULT=all #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 diff --git a/abra.sh b/abra.sh index 015b794..eab1085 100644 --- a/abra.sh +++ b/abra.sh @@ -1,4 +1,4 @@ export ENTRYPOINT_CONF_VERSION=v1 export HOMESERVER_YAML_VERSION=v9 export LOG_CONFIG_VERSION=v2 -export TELEGRAM_BRIDGE_YAML_VERSION=v1 +export TELEGRAM_BRIDGE_YAML_VERSION=v2 diff --git a/compose.telegram.yml b/compose.telegram.yml index 951bb66..28aba53 100644 --- a/compose.telegram.yml +++ b/compose.telegram.yml @@ -20,11 +20,13 @@ services: - APP_SERVICE_BOT_USERNAME - APP_SERVICE_DISPLAY_NAME - APP_SERVICE_ID + - ENABLE_ENCRYPTION - HOMESERVER_DOMAIN - HOMESERVER_URL - - VERIFY_SSL - - ENABLE_ENCRYPTION - TELEGRAM_APP_ID + - TELEGRAM_BRIDGE_ADMIN_1 + - TELEGRAM_BRIDGE_ADMIN_2 + - VERIFY_SSL secrets: - telegram_api_hash - telegram_as_token diff --git a/telegram_bridge.yaml.tmpl b/telegram_bridge.yaml.tmpl index 3718cfe..dfe7e30 100644 --- a/telegram_bridge.yaml.tmpl +++ b/telegram_bridge.yaml.tmpl @@ -414,6 +414,8 @@ bridge: # 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: