Signed-off-by: gardar <gardar@users.noreply.github.com>pull/3236/head
| @@ -40,6 +40,7 @@ Encryption support is off by default. If you would like to enable encryption, ad | |||||
| ```yaml | ```yaml | ||||
| matrix_bridges_encryption_enabled: true | matrix_bridges_encryption_enabled: true | ||||
| matrix_bridges_encryption_default: true | |||||
| ``` | ``` | ||||
| **Alternatively**, for a specific bridge: | **Alternatively**, for a specific bridge: | ||||
| @@ -16,6 +16,9 @@ matrix_admin: '' | |||||
| # Global var to enable/disable encryption across all bridges with encryption support | # Global var to enable/disable encryption across all bridges with encryption support | ||||
| matrix_bridges_encryption_enabled: false | matrix_bridges_encryption_enabled: false | ||||
| # Global var to make encryption default/optional across all bridges with encryption support | |||||
| matrix_bridges_encryption_default: "{{ matrix_bridges_encryption_enabled }}" | |||||
| # Global var to enable/disable relay mode across all bridges with relay mode support | # Global var to enable/disable relay mode across all bridges with relay mode support | ||||
| matrix_bridges_relay_enabled: false | matrix_bridges_relay_enabled: false | ||||
| @@ -130,7 +130,7 @@ matrix_appservice_kakaotalk_user_prefix: 'kakaotalk_' | |||||
| # End-to-bridge encryption configuration | # End-to-bridge encryption configuration | ||||
| matrix_appservice_kakaotalk_bridge_encryption_allow: "{{ matrix_bridges_encryption_enabled }}" | matrix_appservice_kakaotalk_bridge_encryption_allow: "{{ matrix_bridges_encryption_enabled }}" | ||||
| matrix_appservice_kakaotalk_bridge_encryption_default: "{{ matrix_appservice_kakaotalk_bridge_encryption_allow }}" | |||||
| matrix_appservice_kakaotalk_bridge_encryption_default: "{{ matrix_bridges_encryption_default }}" | |||||
| # Specifies the default log level for all bridge loggers. | # Specifies the default log level for all bridge loggers. | ||||
| matrix_appservice_kakaotalk_logging_level: WARNING | matrix_appservice_kakaotalk_logging_level: WARNING | ||||
| @@ -96,7 +96,7 @@ matrix_beeper_linkedin_logging_level: WARNING | |||||
| # Enable End-to-bridge encryption | # Enable End-to-bridge encryption | ||||
| matrix_beeper_linkedin_bridge_encryption_allow: "{{ matrix_bridges_encryption_enabled }}" | matrix_beeper_linkedin_bridge_encryption_allow: "{{ matrix_bridges_encryption_enabled }}" | ||||
| matrix_beeper_linkedin_bridge_encryption_default: "{{ matrix_beeper_linkedin_bridge_encryption_allow }}" | |||||
| matrix_beeper_linkedin_bridge_encryption_default: "{{ matrix_bridges_encryption_default }}" | |||||
| matrix_beeper_linkedin_bridge_encryption_key_sharing_allow: "{{ matrix_beeper_linkedin_bridge_encryption_allow }}" | matrix_beeper_linkedin_bridge_encryption_key_sharing_allow: "{{ matrix_beeper_linkedin_bridge_encryption_allow }}" | ||||
| # Default beeper-linkedin configuration template which covers the generic use case. | # Default beeper-linkedin configuration template which covers the generic use case. | ||||
| @@ -98,7 +98,7 @@ matrix_go_skype_bridge_bridge_double_puppet_server_map: | |||||
| # Enable End-to-bridge encryption | # Enable End-to-bridge encryption | ||||
| matrix_go_skype_bridge_bridge_encryption_allow: "{{ matrix_bridges_encryption_enabled }}" | matrix_go_skype_bridge_bridge_encryption_allow: "{{ matrix_bridges_encryption_enabled }}" | ||||
| matrix_go_skype_bridge_bridge_encryption_default: "{{ matrix_go_skype_bridge_bridge_encryption_allow }}" | |||||
| matrix_go_skype_bridge_bridge_encryption_default: "{{ matrix_bridges_encryption_default }}" | |||||
| # Minimum severity of journal log messages. | # Minimum severity of journal log messages. | ||||
| # Options: debug, info, warn, error, fatal | # Options: debug, info, warn, error, fatal | ||||
| @@ -151,7 +151,7 @@ matrix_mautrix_discord_registration: "{{ matrix_mautrix_discord_registration_yam | |||||
| # Enable End-to-bridge encryption | # Enable End-to-bridge encryption | ||||
| matrix_mautrix_discord_bridge_encryption_allow: "{{ matrix_bridges_encryption_enabled }}" | matrix_mautrix_discord_bridge_encryption_allow: "{{ matrix_bridges_encryption_enabled }}" | ||||
| matrix_mautrix_discord_bridge_encryption_default: "{{ matrix_mautrix_discord_bridge_encryption_allow }}" | |||||
| matrix_mautrix_discord_bridge_encryption_default: "{{ matrix_bridges_encryption_default }}" | |||||
| matrix_mautrix_discord_bridge_encryption_key_sharing_allow: "{{ matrix_mautrix_discord_bridge_encryption_allow }}" | matrix_mautrix_discord_bridge_encryption_key_sharing_allow: "{{ matrix_mautrix_discord_bridge_encryption_allow }}" | ||||
| # On conduit versions before 0.5.0 this option prevented users from joining spaces created by the bridge. | # On conduit versions before 0.5.0 this option prevented users from joining spaces created by the bridge. | ||||
| @@ -203,5 +203,5 @@ matrix_mautrix_facebook_registration: "{{ matrix_mautrix_facebook_registration_y | |||||
| # Enable End-to-bridge encryption | # Enable End-to-bridge encryption | ||||
| matrix_mautrix_facebook_bridge_encryption_allow: "{{ matrix_bridges_encryption_enabled }}" | matrix_mautrix_facebook_bridge_encryption_allow: "{{ matrix_bridges_encryption_enabled }}" | ||||
| matrix_mautrix_facebook_bridge_encryption_default: "{{ matrix_mautrix_facebook_bridge_encryption_allow }}" | |||||
| matrix_mautrix_facebook_bridge_encryption_default: "{{ matrix_bridges_encryption_default }}" | |||||
| matrix_mautrix_facebook_bridge_encryption_key_sharing_allow: "{{ matrix_mautrix_facebook_bridge_encryption_allow }}" | matrix_mautrix_facebook_bridge_encryption_key_sharing_allow: "{{ matrix_mautrix_facebook_bridge_encryption_allow }}" | ||||
| @@ -139,7 +139,7 @@ matrix_mautrix_gmessages_bridge_login_shared_secret_map: | |||||
| # Enable End-to-bridge encryption | # Enable End-to-bridge encryption | ||||
| matrix_mautrix_gmessages_bridge_encryption_allow: "{{ matrix_bridges_encryption_enabled }}" | matrix_mautrix_gmessages_bridge_encryption_allow: "{{ matrix_bridges_encryption_enabled }}" | ||||
| matrix_mautrix_gmessages_bridge_encryption_default: "{{ matrix_mautrix_gmessages_bridge_encryption_allow }}" | |||||
| matrix_mautrix_gmessages_bridge_encryption_default: "{{ matrix_bridges_encryption_default }}" | |||||
| matrix_mautrix_gmessages_bridge_encryption_key_sharing_allow: "{{ matrix_mautrix_gmessages_bridge_encryption_allow }}" | matrix_mautrix_gmessages_bridge_encryption_key_sharing_allow: "{{ matrix_mautrix_gmessages_bridge_encryption_allow }}" | ||||
| matrix_mautrix_gmessages_bridge_personal_filtering_spaces: true | matrix_mautrix_gmessages_bridge_personal_filtering_spaces: true | ||||
| @@ -191,4 +191,4 @@ matrix_mautrix_googlechat_registration: "{{ matrix_mautrix_googlechat_registrati | |||||
| # Enable End-to-bridge encryption | # Enable End-to-bridge encryption | ||||
| matrix_mautrix_googlechat_bridge_encryption_allow: "{{ matrix_bridges_encryption_enabled }}" | matrix_mautrix_googlechat_bridge_encryption_allow: "{{ matrix_bridges_encryption_enabled }}" | ||||
| matrix_mautrix_googlechat_bridge_encryption_default: "{{ matrix_mautrix_googlechat_bridge_encryption_allow }}" | |||||
| matrix_mautrix_googlechat_bridge_encryption_default: "{{ matrix_bridges_encryption_default }}" | |||||
| @@ -187,4 +187,4 @@ matrix_mautrix_hangouts_registration: "{{ matrix_mautrix_hangouts_registration_y | |||||
| # Enable End-to-bridge encryption | # Enable End-to-bridge encryption | ||||
| matrix_mautrix_hangouts_bridge_encryption_allow: "{{ matrix_bridges_encryption_enabled }}" | matrix_mautrix_hangouts_bridge_encryption_allow: "{{ matrix_bridges_encryption_enabled }}" | ||||
| matrix_mautrix_hangouts_bridge_encryption_default: "{{ matrix_mautrix_hangouts_bridge_encryption_allow }}" | |||||
| matrix_mautrix_hangouts_bridge_encryption_default: "{{ matrix_bridges_encryption_default }}" | |||||
| @@ -174,5 +174,5 @@ matrix_mautrix_instagram_registration: "{{ matrix_mautrix_instagram_registration | |||||
| # Enable End-to-bridge encryption | # Enable End-to-bridge encryption | ||||
| matrix_mautrix_instagram_bridge_encryption_allow: "{{ matrix_bridges_encryption_enabled }}" | matrix_mautrix_instagram_bridge_encryption_allow: "{{ matrix_bridges_encryption_enabled }}" | ||||
| matrix_mautrix_instagram_bridge_encryption_default: "{{ matrix_mautrix_instagram_bridge_encryption_allow }}" | |||||
| matrix_mautrix_instagram_bridge_encryption_default: "{{ matrix_bridges_encryption_default }}" | |||||
| matrix_mautrix_instagram_bridge_encryption_key_sharing_allow: "{{ matrix_mautrix_instagram_bridge_encryption_allow }}" | matrix_mautrix_instagram_bridge_encryption_key_sharing_allow: "{{ matrix_mautrix_instagram_bridge_encryption_allow }}" | ||||
| @@ -209,7 +209,7 @@ matrix_mautrix_meta_instagram_bridge_personal_filtering_spaces: true | |||||
| # Enable End-to-bridge encryption | # Enable End-to-bridge encryption | ||||
| matrix_mautrix_meta_instagram_bridge_encryption_allow: "{{ matrix_bridges_encryption_enabled }}" | matrix_mautrix_meta_instagram_bridge_encryption_allow: "{{ matrix_bridges_encryption_enabled }}" | ||||
| matrix_mautrix_meta_instagram_bridge_encryption_default: "{{ matrix_mautrix_meta_instagram_bridge_encryption_allow }}" | |||||
| matrix_mautrix_meta_instagram_bridge_encryption_default: "{{ matrix_bridges_encryption_default }}" | |||||
| matrix_mautrix_meta_instagram_bridge_encryption_allow_key_sharing: "{{ matrix_mautrix_meta_instagram_bridge_encryption_allow }}" | matrix_mautrix_meta_instagram_bridge_encryption_allow_key_sharing: "{{ matrix_mautrix_meta_instagram_bridge_encryption_allow }}" | ||||
| matrix_mautrix_meta_instagram_bridge_encryption_appservice: false | matrix_mautrix_meta_instagram_bridge_encryption_appservice: false | ||||
| matrix_mautrix_meta_instagram_bridge_encryption_require: false | matrix_mautrix_meta_instagram_bridge_encryption_require: false | ||||
| @@ -209,7 +209,7 @@ matrix_mautrix_meta_messenger_bridge_personal_filtering_spaces: true | |||||
| # Enable End-to-bridge encryption | # Enable End-to-bridge encryption | ||||
| matrix_mautrix_meta_messenger_bridge_encryption_allow: "{{ matrix_bridges_encryption_enabled }}" | matrix_mautrix_meta_messenger_bridge_encryption_allow: "{{ matrix_bridges_encryption_enabled }}" | ||||
| matrix_mautrix_meta_messenger_bridge_encryption_default: "{{ matrix_mautrix_meta_messenger_bridge_encryption_allow }}" | |||||
| matrix_mautrix_meta_messenger_bridge_encryption_default: "{{ matrix_bridges_encryption_default }}" | |||||
| matrix_mautrix_meta_messenger_bridge_encryption_allow_key_sharing: "{{ matrix_mautrix_meta_messenger_bridge_encryption_allow }}" | matrix_mautrix_meta_messenger_bridge_encryption_allow_key_sharing: "{{ matrix_mautrix_meta_messenger_bridge_encryption_allow }}" | ||||
| matrix_mautrix_meta_messenger_bridge_encryption_appservice: false | matrix_mautrix_meta_messenger_bridge_encryption_appservice: false | ||||
| matrix_mautrix_meta_messenger_bridge_encryption_require: false | matrix_mautrix_meta_messenger_bridge_encryption_require: false | ||||
| @@ -196,7 +196,7 @@ matrix_mautrix_signal_registration: "{{ matrix_mautrix_signal_registration_yaml | |||||
| # Enable End-to-bridge encryption | # Enable End-to-bridge encryption | ||||
| matrix_mautrix_signal_bridge_encryption_allow: "{{ matrix_bridges_encryption_enabled }}" | matrix_mautrix_signal_bridge_encryption_allow: "{{ matrix_bridges_encryption_enabled }}" | ||||
| matrix_mautrix_signal_bridge_encryption_default: "{{ matrix_mautrix_signal_bridge_encryption_allow }}" | |||||
| matrix_mautrix_signal_bridge_encryption_default: "{{ matrix_bridges_encryption_default }}" | |||||
| matrix_mautrix_signal_bridge_encryption_key_sharing_allow: "{{ matrix_mautrix_signal_bridge_encryption_allow }}" | matrix_mautrix_signal_bridge_encryption_key_sharing_allow: "{{ matrix_mautrix_signal_bridge_encryption_allow }}" | ||||
| matrix_mautrix_signal_bridge_personal_filtering_spaces: true | matrix_mautrix_signal_bridge_personal_filtering_spaces: true | ||||
| @@ -145,5 +145,5 @@ matrix_mautrix_slack_registration: "{{ matrix_mautrix_slack_registration_yaml | | |||||
| # Enable End-to-bridge encryption | # Enable End-to-bridge encryption | ||||
| matrix_mautrix_slack_bridge_encryption_allow: "{{ matrix_bridges_encryption_enabled }}" | matrix_mautrix_slack_bridge_encryption_allow: "{{ matrix_bridges_encryption_enabled }}" | ||||
| matrix_mautrix_slack_bridge_encryption_default: "{{ matrix_mautrix_slack_bridge_encryption_allow }}" | |||||
| matrix_mautrix_slack_bridge_encryption_default: "{{ matrix_bridges_encryption_default }}" | |||||
| matrix_mautrix_slack_bridge_encryption_key_sharing_allow: "{{ matrix_mautrix_slack_bridge_encryption_allow }}" | matrix_mautrix_slack_bridge_encryption_key_sharing_allow: "{{ matrix_mautrix_slack_bridge_encryption_allow }}" | ||||
| @@ -234,5 +234,5 @@ matrix_mautrix_telegram_displayname_template: '{displayname} (Telegram)' | |||||
| # Enable End-to-bridge encryption | # Enable End-to-bridge encryption | ||||
| matrix_mautrix_telegram_bridge_encryption_allow: "{{ matrix_bridges_encryption_enabled }}" | matrix_mautrix_telegram_bridge_encryption_allow: "{{ matrix_bridges_encryption_enabled }}" | ||||
| matrix_mautrix_telegram_bridge_encryption_default: "{{ matrix_mautrix_telegram_bridge_encryption_allow }}" | |||||
| matrix_mautrix_telegram_bridge_encryption_default: "{{ matrix_bridges_encryption_default }}" | |||||
| matrix_mautrix_telegram_bridge_encryption_key_sharing_allow: "{{ matrix_mautrix_telegram_bridge_encryption_allow }}" | matrix_mautrix_telegram_bridge_encryption_key_sharing_allow: "{{ matrix_mautrix_telegram_bridge_encryption_allow }}" | ||||
| @@ -169,5 +169,5 @@ matrix_mautrix_twitter_registration: "{{ matrix_mautrix_twitter_registration_yam | |||||
| # Enable End-to-bridge encryption | # Enable End-to-bridge encryption | ||||
| matrix_mautrix_twitter_bridge_encryption_allow: "{{ matrix_bridges_encryption_enabled }}" | matrix_mautrix_twitter_bridge_encryption_allow: "{{ matrix_bridges_encryption_enabled }}" | ||||
| matrix_mautrix_twitter_bridge_encryption_default: "{{ matrix_mautrix_twitter_bridge_encryption_allow }}" | |||||
| matrix_mautrix_twitter_bridge_encryption_default: "{{ matrix_bridges_encryption_default }}" | |||||
| matrix_mautrix_twitter_bridge_encryption_key_sharing_allow: "{{ matrix_mautrix_twitter_bridge_encryption_allow }}" | matrix_mautrix_twitter_bridge_encryption_key_sharing_allow: "{{ matrix_mautrix_twitter_bridge_encryption_allow }}" | ||||
| @@ -141,7 +141,7 @@ matrix_mautrix_whatsapp_bridge_login_shared_secret_map: | |||||
| # Enable End-to-bridge encryption | # Enable End-to-bridge encryption | ||||
| matrix_mautrix_whatsapp_bridge_encryption_allow: "{{ matrix_bridges_encryption_enabled }}" | matrix_mautrix_whatsapp_bridge_encryption_allow: "{{ matrix_bridges_encryption_enabled }}" | ||||
| matrix_mautrix_whatsapp_bridge_encryption_default: "{{ matrix_mautrix_whatsapp_bridge_encryption_allow }}" | |||||
| matrix_mautrix_whatsapp_bridge_encryption_default: "{{ matrix_bridges_encryption_default }}" | |||||
| matrix_mautrix_whatsapp_bridge_encryption_key_sharing_allow: "{{ matrix_mautrix_whatsapp_bridge_encryption_allow }}" | matrix_mautrix_whatsapp_bridge_encryption_key_sharing_allow: "{{ matrix_mautrix_whatsapp_bridge_encryption_allow }}" | ||||
| matrix_mautrix_whatsapp_bridge_personal_filtering_spaces: true | matrix_mautrix_whatsapp_bridge_personal_filtering_spaces: true | ||||