Explorar el Código

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 <noreply@anthropic.com>
pull/5501/head
Slavi Pantaleev hace 5 días
padre
commit
fe57c8ef7a
Se han modificado 6 ficheros con 2 adiciones y 14 borrados
  1. +0
    -3
      roles/custom/matrix-bridge-mautrix-meta-instagram/defaults/main.yml
  2. +1
    -0
      roles/custom/matrix-bridge-mautrix-meta-instagram/tasks/validate_config.yml
  3. +0
    -4
      roles/custom/matrix-bridge-mautrix-meta-instagram/templates/config.yaml.j2
  4. +0
    -3
      roles/custom/matrix-bridge-mautrix-meta-messenger/defaults/main.yml
  5. +1
    -0
      roles/custom/matrix-bridge-mautrix-meta-messenger/tasks/validate_config.yml
  6. +0
    -4
      roles/custom/matrix-bridge-mautrix-meta-messenger/templates/config.yaml.j2

+ 0
- 3
roles/custom/matrix-bridge-mautrix-meta-instagram/defaults/main.yml Ver fichero

@@ -172,9 +172,6 @@ matrix_bridge_mautrix_meta_instagram_appservice_token: ''
# * instagram - connect to Instagram DMs via instagram.com # * instagram - connect to Instagram DMs via instagram.com
matrix_bridge_mautrix_meta_instagram_meta_mode: instagram 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 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). # Controls whether mautrix-meta-instagram's HTTP API is exposed publicly (used by tools like mautrix-manager for bridge login).


+ 1
- 0
roles/custom/matrix-bridge-mautrix-meta-instagram/tasks/validate_config.yml Ver fichero

@@ -42,3 +42,4 @@
- {'old': 'matrix_bridge_mautrix_meta_instagram_container_labels_metrics_traefik_tls_certResolver', 'new': '<removed> (mautrix-meta-instagram does not support metrics)'} - {'old': 'matrix_bridge_mautrix_meta_instagram_container_labels_metrics_traefik_tls_certResolver', 'new': '<removed> (mautrix-meta-instagram does not support metrics)'}
- {'old': 'matrix_bridge_mautrix_meta_instagram_container_labels_metrics_middleware_basic_auth_enabled', 'new': '<removed> (mautrix-meta-instagram does not support metrics)'} - {'old': 'matrix_bridge_mautrix_meta_instagram_container_labels_metrics_middleware_basic_auth_enabled', 'new': '<removed> (mautrix-meta-instagram does not support metrics)'}
- {'old': 'matrix_bridge_mautrix_meta_instagram_container_labels_metrics_middleware_basic_auth_users', 'new': '<removed> (mautrix-meta-instagram does not support metrics)'} - {'old': 'matrix_bridge_mautrix_meta_instagram_container_labels_metrics_middleware_basic_auth_users', 'new': '<removed> (mautrix-meta-instagram does not support metrics)'}
- {'old': 'matrix_bridge_mautrix_meta_instagram_meta_ig_e2ee', 'new': '<removed> (mautrix-meta no longer has an `ig_e2ee` configuration option)'}

+ 0
- 4
roles/custom/matrix-bridge-mautrix-meta-instagram/templates/config.yaml.j2 Ver fichero

@@ -12,10 +12,6 @@ network:
# Remember to change the appservice ID, bot profile info, bridge username_template and management_room_text too. # 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 }} 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 template for FB/IG users. Available variables:
# .DisplayName - The display name set by the user. # .DisplayName - The display name set by the user.
# .Username - The username set by the user. # .Username - The username set by the user.


+ 0
- 3
roles/custom/matrix-bridge-mautrix-meta-messenger/defaults/main.yml Ver fichero

@@ -172,9 +172,6 @@ matrix_bridge_mautrix_meta_messenger_appservice_token: ''
# * instagram - connect to Instagram DMs via instagram.com # * instagram - connect to Instagram DMs via instagram.com
matrix_bridge_mautrix_meta_messenger_meta_mode: messenger 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 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). # Controls whether mautrix-meta-messenger's HTTP API is exposed publicly (used by tools like mautrix-manager for bridge login).


+ 1
- 0
roles/custom/matrix-bridge-mautrix-meta-messenger/tasks/validate_config.yml Ver fichero

@@ -42,3 +42,4 @@
- {'old': 'matrix_bridge_mautrix_meta_messenger_container_labels_metrics_traefik_tls_certResolver', 'new': '<removed> (mautrix-meta-messenger does not support metrics)'} - {'old': 'matrix_bridge_mautrix_meta_messenger_container_labels_metrics_traefik_tls_certResolver', 'new': '<removed> (mautrix-meta-messenger does not support metrics)'}
- {'old': 'matrix_bridge_mautrix_meta_messenger_container_labels_metrics_middleware_basic_auth_enabled', 'new': '<removed> (mautrix-meta-messenger does not support metrics)'} - {'old': 'matrix_bridge_mautrix_meta_messenger_container_labels_metrics_middleware_basic_auth_enabled', 'new': '<removed> (mautrix-meta-messenger does not support metrics)'}
- {'old': 'matrix_bridge_mautrix_meta_messenger_container_labels_metrics_middleware_basic_auth_users', 'new': '<removed> (mautrix-meta-messenger does not support metrics)'} - {'old': 'matrix_bridge_mautrix_meta_messenger_container_labels_metrics_middleware_basic_auth_users', 'new': '<removed> (mautrix-meta-messenger does not support metrics)'}
- {'old': 'matrix_bridge_mautrix_meta_messenger_meta_ig_e2ee', 'new': '<removed> (mautrix-meta no longer has an `ig_e2ee` configuration option)'}

+ 0
- 4
roles/custom/matrix-bridge-mautrix-meta-messenger/templates/config.yaml.j2 Ver fichero

@@ -12,10 +12,6 @@ network:
# Remember to change the appservice ID, bot profile info, bridge username_template and management_room_text too. # 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 }} 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 template for FB/IG users. Available variables:
# .DisplayName - The display name set by the user. # .DisplayName - The display name set by the user.
# .Username - The username set by the user. # .Username - The username set by the user.


Cargando…
Cancelar
Guardar