Skip to content

Commit

Permalink
Remove some "generate" values from various mautrix bridges
Browse files Browse the repository at this point in the history
We do not let bridges update config files, so generation cannot happen.
We don't want the bridge to manage the config file anyway.
  • Loading branch information
spantaleev committed Dec 17, 2024
1 parent 8ab4315 commit beeb8a7
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 5 deletions.
2 changes: 2 additions & 0 deletions roles/custom/matrix-bridge-mautrix-discord/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ matrix_mautrix_discord_homeserver_token: ''

matrix_mautrix_discord_appservice_bot_username: discordbot

matrix_mautrix_discord_provisioning_shared_secret: disable

# Minimum severity of journal log messages.
# Options: debug, info, warn, error, fatal
matrix_mautrix_discord_logging_level: 'warn'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ bridge:
prefix: /_matrix/provision
# Shared secret for authentication. If set to "generate", a random secret will be generated,
# or if set to "disable", the provisioning API will be disabled.
shared_secret: generate
shared_secret: {{ matrix_mautrix_discord_provisioning_shared_secret | to_json }}

# Permissions for using the bridge.
# Permitted values:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,8 @@ matrix_mautrix_meta_instagram_meta_mode: instagram
# When in `instagram` mode (see `matrix_mautrix_meta_instagram_meta_mode`), should the bridge connect to WhatsApp servers for encrypted chats?
matrix_mautrix_meta_instagram_meta_ig_e2ee: false

matrix_mautrix_meta_instagram_provisioning_shared_secret: disable

# Whether or not metrics endpoint should be enabled.
# Enabling them is usually enough for a local (in-container) Prometheus to consume them.
# If metrics need to be consumed by another (external) Prometheus server, consider exposing them via `matrix_mautrix_meta_instagram_metrics_proxying_enabled`.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ provisioning:
prefix: /_matrix/provision
# Shared secret for authentication. If set to "generate" or null, a random secret will be generated,
# or if set to "disable", the provisioning API will be disabled.
shared_secret: disable
shared_secret: {{ matrix_mautrix_meta_instagram_provisioning_shared_secret | to_json }}
# Whether to allow provisioning API requests to be authed using Matrix access tokens.
# This follows the same rules as double puppeting to determine which server to contact to check the token,
# which means that by default, it only works for users on the same server as the bridge.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,8 @@ matrix_mautrix_meta_messenger_meta_mode: messenger
# When in `instagram` mode (see `matrix_mautrix_meta_messenger_meta_mode`), should the bridge connect to WhatsApp servers for encrypted chats?
matrix_mautrix_meta_messenger_meta_ig_e2ee: false

matrix_mautrix_meta_messenger_provisioning_shared_secret: disable

# Whether or not metrics endpoint should be enabled.
# Enabling them is usually enough for a local (in-container) Prometheus to consume them.
# If metrics need to be consumed by another (external) Prometheus server, consider exposing them via `matrix_mautrix_meta_messenger_metrics_proxying_enabled`.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ provisioning:
prefix: /_matrix/provision
# Shared secret for authentication. If set to "generate" or null, a random secret will be generated,
# or if set to "disable", the provisioning API will be disabled.
shared_secret: disable
shared_secret: {{ matrix_mautrix_meta_messenger_provisioning_shared_secret | to_json }}
# Whether to allow provisioning API requests to be authed using Matrix access tokens.
# This follows the same rules as double puppeting to determine which server to contact to check the token,
# which means that by default, it only works for users on the same server as the bridge.
Expand Down
2 changes: 2 additions & 0 deletions roles/custom/matrix-bridge-mautrix-telegram/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,8 @@ matrix_mautrix_telegram_systemd_wanted_services_list: []
matrix_mautrix_telegram_appservice_token: ''
matrix_mautrix_telegram_homeserver_token: ''

matrix_mautrix_telegram_provisioning_shared_secret: disable

# Whether or not metrics endpoint should be enabled.
# Enabling them is usually enough for a local (in-container) Prometheus to consume them.
# If metrics need to be consumed by another (external) Prometheus server, consider exposing them via `matrix_mautrix_telegram_metrics_proxying_enabled`.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ appservice:
prefix: /_matrix/provision/v1
# The shared secret to authorize users of the API.
# Set to "generate" to generate and save a new token.
shared_secret: generate
shared_secret: {{ matrix_mautrix_telegram_provisioning_shared_secret | to_json }}

# The unique ID of this appservice.
id: telegram
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ direct_media:
allow_proxy: true
# Matrix server signing key to make the federation tester pass, same format as synapse's .signing.key file.
# This key is also used to sign the mxc:// URIs to ensure only the bridge can generate them.
server_key: generate
server_key: ""

# Settings for backfilling messages.
# Note that the exact way settings are applied depends on the network connector.
Expand Down

0 comments on commit beeb8a7

Please sign in to comment.