| @@ -28,6 +28,9 @@ matrix_mautrix_telegram_api_id: '' | |||||
| matrix_mautrix_telegram_api_hash: '' | matrix_mautrix_telegram_api_hash: '' | ||||
| matrix_mautrix_telegram_bot_token: disabled | matrix_mautrix_telegram_bot_token: disabled | ||||
| # Whether or not the public-facing endpoints should be enabled (web-based login) | |||||
| matrix_mautrix_telegram_appservice_public_enabled: true | |||||
| # Mautrix telegram public endpoint to log in to telegram | # Mautrix telegram public endpoint to log in to telegram | ||||
| # Use an uuid so it's not easily discoverable. | # Use an uuid so it's not easily discoverable. | ||||
| # Example: /741a0483-ba17-4682-9900-30bd7269f1cc | # Example: /741a0483-ba17-4682-9900-30bd7269f1cc | ||||
| @@ -56,16 +56,16 @@ | |||||
| + | + | ||||
| [matrix_mautrix_telegram_matrix_nginx_proxy_configuration] | [matrix_mautrix_telegram_matrix_nginx_proxy_configuration] | ||||
| }} | }} | ||||
| - name: Warn about reverse-proxying if matrix-nginx-proxy not used | |||||
| debug: | |||||
| msg: >- | |||||
| NOTE: You've enabled the Mautrix Telegram bridge but are not using the matrix-nginx-proxy | |||||
| reverse proxy. | |||||
| Please make sure that you're proxying the `{{ matrix_mautrix_telegram_public_endpoint }}` | |||||
| URL endpoint to the matrix-mautrix-telegram container. | |||||
| You can expose the container's port using the `matrix_mautrix_telegram_container_http_host_bind_port` variable. | |||||
| when: "not matrix_nginx_proxy_enabled|default(False)|bool" | |||||
| tags: | tags: | ||||
| - always | - always | ||||
| when: matrix_mautrix_telegram_enabled|bool | |||||
| - name: Warn about reverse-proxying if matrix-nginx-proxy not used | |||||
| debug: | |||||
| msg: >- | |||||
| NOTE: You've enabled the Mautrix Telegram bridge but are not using the matrix-nginx-proxy | |||||
| reverse proxy. | |||||
| Please make sure that you're proxying the `{{ matrix_mautrix_telegram_public_endpoint }}` | |||||
| URL endpoint to the matrix-mautrix-telegram container. | |||||
| You can expose the container's port using the `matrix_mautrix_telegram_container_http_host_bind_port` variable. | |||||
| when: "matrix_mautrix_telegram_enabled|bool and not matrix_nginx_proxy_enabled|default(False)|bool" | |||||
| when: matrix_mautrix_telegram_enabled|bool and matrix_mautrix_telegram_appservice_public_enabled|bool | |||||
| @@ -34,7 +34,7 @@ appservice: | |||||
| # the HS database. | # the HS database. | ||||
| public: | public: | ||||
| # Whether or not the public-facing endpoints should be enabled. | # Whether or not the public-facing endpoints should be enabled. | ||||
| enabled: true | |||||
| enabled: {{ matrix_mautrix_telegram_appservice_public_enabled|to_json }} | |||||
| # The prefix to use in the public-facing endpoints. | # The prefix to use in the public-facing endpoints. | ||||
| prefix: {{ matrix_mautrix_telegram_public_endpoint|to_json }} | prefix: {{ matrix_mautrix_telegram_public_endpoint|to_json }} | ||||
| # The base URL where the public-facing endpoints are available. The prefix is not added | # The base URL where the public-facing endpoints are available. The prefix is not added | ||||
| @@ -24,7 +24,7 @@ ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-mautrix-telegr | |||||
| --user={{ matrix_user_uid }}:{{ matrix_user_gid }} \ | --user={{ matrix_user_uid }}:{{ matrix_user_gid }} \ | ||||
| --cap-drop=ALL \ | --cap-drop=ALL \ | ||||
| --network={{ matrix_docker_network }} \ | --network={{ matrix_docker_network }} \ | ||||
| {% if matrix_mautrix_telegram_container_http_host_bind_port %} | |||||
| {% if matrix_mautrix_telegram_appservice_public_enabled and matrix_mautrix_telegram_container_http_host_bind_port %} | |||||
| -p {{ matrix_mautrix_telegram_container_http_host_bind_port }}:8080 \ | -p {{ matrix_mautrix_telegram_container_http_host_bind_port }}:8080 \ | ||||
| {% endif %} | {% endif %} | ||||
| -v {{ matrix_mautrix_telegram_config_path }}:/config:z \ | -v {{ matrix_mautrix_telegram_config_path }}:/config:z \ | ||||