From fe57c8ef7a9aac201b7cfab27fa1a6b9375bc643 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Thu, 13 Aug 2026 07:14:56 +0300 Subject: [PATCH] Drop the mautrix-meta ig_e2ee configuration option Upstream no longer has an `ig_e2ee` option in either connector. It is already absent at v0.2607.0, the version both roles are pinned to, so we have been rendering a dead key into config.yaml for a while. Anyone who set the variable is told it is gone, via the usual deprecated-variable check. Co-Authored-By: Claude Opus 5 --- .../matrix-bridge-mautrix-meta-instagram/defaults/main.yml | 3 --- .../tasks/validate_config.yml | 1 + .../templates/config.yaml.j2 | 4 ---- .../matrix-bridge-mautrix-meta-messenger/defaults/main.yml | 3 --- .../tasks/validate_config.yml | 1 + .../templates/config.yaml.j2 | 4 ---- 6 files changed, 2 insertions(+), 14 deletions(-) diff --git a/roles/custom/matrix-bridge-mautrix-meta-instagram/defaults/main.yml b/roles/custom/matrix-bridge-mautrix-meta-instagram/defaults/main.yml index 00c31c955..8c49d7f28 100644 --- a/roles/custom/matrix-bridge-mautrix-meta-instagram/defaults/main.yml +++ b/roles/custom/matrix-bridge-mautrix-meta-instagram/defaults/main.yml @@ -172,9 +172,6 @@ matrix_bridge_mautrix_meta_instagram_appservice_token: '' # * instagram - connect to Instagram DMs via instagram.com matrix_bridge_mautrix_meta_instagram_meta_mode: instagram -# When in `instagram` mode (see `matrix_bridge_mautrix_meta_instagram_meta_mode`), should the bridge connect to WhatsApp servers for encrypted chats? -matrix_bridge_mautrix_meta_instagram_meta_ig_e2ee: false - matrix_bridge_mautrix_meta_instagram_provisioning_shared_secret: disable # Controls whether mautrix-meta-instagram's HTTP API is exposed publicly (used by tools like mautrix-manager for bridge login). diff --git a/roles/custom/matrix-bridge-mautrix-meta-instagram/tasks/validate_config.yml b/roles/custom/matrix-bridge-mautrix-meta-instagram/tasks/validate_config.yml index 84747189a..e490850d9 100644 --- a/roles/custom/matrix-bridge-mautrix-meta-instagram/tasks/validate_config.yml +++ b/roles/custom/matrix-bridge-mautrix-meta-instagram/tasks/validate_config.yml @@ -42,3 +42,4 @@ - {'old': 'matrix_bridge_mautrix_meta_instagram_container_labels_metrics_traefik_tls_certResolver', 'new': ' (mautrix-meta-instagram does not support metrics)'} - {'old': 'matrix_bridge_mautrix_meta_instagram_container_labels_metrics_middleware_basic_auth_enabled', 'new': ' (mautrix-meta-instagram does not support metrics)'} - {'old': 'matrix_bridge_mautrix_meta_instagram_container_labels_metrics_middleware_basic_auth_users', 'new': ' (mautrix-meta-instagram does not support metrics)'} + - {'old': 'matrix_bridge_mautrix_meta_instagram_meta_ig_e2ee', 'new': ' (mautrix-meta no longer has an `ig_e2ee` configuration option)'} diff --git a/roles/custom/matrix-bridge-mautrix-meta-instagram/templates/config.yaml.j2 b/roles/custom/matrix-bridge-mautrix-meta-instagram/templates/config.yaml.j2 index a0816e0c7..edddf2d79 100644 --- a/roles/custom/matrix-bridge-mautrix-meta-instagram/templates/config.yaml.j2 +++ b/roles/custom/matrix-bridge-mautrix-meta-instagram/templates/config.yaml.j2 @@ -12,10 +12,6 @@ network: # Remember to change the appservice ID, bot profile info, bridge username_template and management_room_text too. mode: {{ matrix_bridge_mautrix_meta_instagram_meta_mode | to_json }} - # When in Instagram mode, should the bridge connect to WhatsApp servers for encrypted chats? - # In FB/Messenger mode encryption is always enabled, this option only affects Instagram mode. - ig_e2ee: {{ matrix_bridge_mautrix_meta_instagram_meta_ig_e2ee | to_json }} - # Displayname template for FB/IG users. Available variables: # .DisplayName - The display name set by the user. # .Username - The username set by the user. diff --git a/roles/custom/matrix-bridge-mautrix-meta-messenger/defaults/main.yml b/roles/custom/matrix-bridge-mautrix-meta-messenger/defaults/main.yml index 236cde7d8..81bc808bd 100644 --- a/roles/custom/matrix-bridge-mautrix-meta-messenger/defaults/main.yml +++ b/roles/custom/matrix-bridge-mautrix-meta-messenger/defaults/main.yml @@ -172,9 +172,6 @@ matrix_bridge_mautrix_meta_messenger_appservice_token: '' # * instagram - connect to Instagram DMs via instagram.com matrix_bridge_mautrix_meta_messenger_meta_mode: messenger -# When in `instagram` mode (see `matrix_bridge_mautrix_meta_messenger_meta_mode`), should the bridge connect to WhatsApp servers for encrypted chats? -matrix_bridge_mautrix_meta_messenger_meta_ig_e2ee: false - matrix_bridge_mautrix_meta_messenger_provisioning_shared_secret: disable # Controls whether mautrix-meta-messenger's HTTP API is exposed publicly (used by tools like mautrix-manager for bridge login). diff --git a/roles/custom/matrix-bridge-mautrix-meta-messenger/tasks/validate_config.yml b/roles/custom/matrix-bridge-mautrix-meta-messenger/tasks/validate_config.yml index 5a6350e10..529e75785 100644 --- a/roles/custom/matrix-bridge-mautrix-meta-messenger/tasks/validate_config.yml +++ b/roles/custom/matrix-bridge-mautrix-meta-messenger/tasks/validate_config.yml @@ -42,3 +42,4 @@ - {'old': 'matrix_bridge_mautrix_meta_messenger_container_labels_metrics_traefik_tls_certResolver', 'new': ' (mautrix-meta-messenger does not support metrics)'} - {'old': 'matrix_bridge_mautrix_meta_messenger_container_labels_metrics_middleware_basic_auth_enabled', 'new': ' (mautrix-meta-messenger does not support metrics)'} - {'old': 'matrix_bridge_mautrix_meta_messenger_container_labels_metrics_middleware_basic_auth_users', 'new': ' (mautrix-meta-messenger does not support metrics)'} + - {'old': 'matrix_bridge_mautrix_meta_messenger_meta_ig_e2ee', 'new': ' (mautrix-meta no longer has an `ig_e2ee` configuration option)'} diff --git a/roles/custom/matrix-bridge-mautrix-meta-messenger/templates/config.yaml.j2 b/roles/custom/matrix-bridge-mautrix-meta-messenger/templates/config.yaml.j2 index 935073e81..47accdcef 100644 --- a/roles/custom/matrix-bridge-mautrix-meta-messenger/templates/config.yaml.j2 +++ b/roles/custom/matrix-bridge-mautrix-meta-messenger/templates/config.yaml.j2 @@ -12,10 +12,6 @@ network: # Remember to change the appservice ID, bot profile info, bridge username_template and management_room_text too. mode: {{ matrix_bridge_mautrix_meta_messenger_meta_mode | to_json }} - # When in Instagram mode, should the bridge connect to WhatsApp servers for encrypted chats? - # In FB/Messenger mode encryption is always enabled, this option only affects Instagram mode. - ig_e2ee: {{ matrix_bridge_mautrix_meta_messenger_meta_ig_e2ee | to_json }} - # Displayname template for FB/IG users. Available variables: # .DisplayName - The display name set by the user. # .Username - The username set by the user.