From 62b53758156d029f060d4e06a4610a3ef068be6c Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Thu, 16 Jul 2026 14:47:37 +0300 Subject: [PATCH] Rename matrix_beeper_linkedin_* variables to matrix_bridge_beeper_linkedin_* Part of adopting a uniform naming policy for bridge variables, where the variable prefix matches the role directory name. Co-Authored-By: Claude Fable 5 --- ...iguring-playbook-bridge-beeper-linkedin.md | 4 +- group_vars/matrix_servers | 56 +++--- .../defaults/main.yml | 170 +++++++++--------- .../tasks/main.yml | 6 +- .../tasks/setup_install.yml | 70 ++++---- .../tasks/setup_uninstall.yml | 4 +- .../tasks/validate_config.yml | 30 ++-- .../templates/config.yaml.j2 | 50 +++--- .../systemd/matrix-beeper-linkedin.service.j2 | 16 +- .../defaults/main.yml | 2 +- 10 files changed, 204 insertions(+), 204 deletions(-) diff --git a/docs/configuring-playbook-bridge-beeper-linkedin.md b/docs/configuring-playbook-bridge-beeper-linkedin.md index 4016b0b37..b639e9a9b 100644 --- a/docs/configuring-playbook-bridge-beeper-linkedin.md +++ b/docs/configuring-playbook-bridge-beeper-linkedin.md @@ -29,7 +29,7 @@ See [this section](configuring-playbook-bridge-mautrix-bridges.md#set-up-double- To enable the bridge, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml -matrix_beeper_linkedin_enabled: true +matrix_bridge_beeper_linkedin_enabled: true ``` ### Extending the configuration @@ -68,7 +68,7 @@ As with all other services, you can find the logs in [systemd-journald](https:// The default logging level for this component is `WARNING`. If you want to increase the verbosity, add the following configuration to your `vars.yml` file and re-run the playbook: ```yaml -matrix_beeper_linkedin_logging_level: DEBUG +matrix_bridge_beeper_linkedin_logging_level: DEBUG ``` ### Bridge asking for 2FA even if you don't have 2FA enabled diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers index 8f8e1903d..081eb4e9b 100755 --- a/group_vars/matrix_servers +++ b/group_vars/matrix_servers @@ -102,7 +102,7 @@ matrix_homeserver_container_extra_arguments_auto: | + (['--mount type=bind,src=' + matrix_bridge_appservice_irc_config_path + '/registration.yaml,dst=/matrix-appservice-irc-registration.yaml,ro'] if matrix_bridge_appservice_irc_enabled else []) + - (['--mount type=bind,src=' + matrix_beeper_linkedin_config_path + '/registration.yaml,dst=/matrix-beeper-linkedin-registration.yaml,ro'] if matrix_beeper_linkedin_enabled else []) + (['--mount type=bind,src=' + matrix_bridge_beeper_linkedin_config_path + '/registration.yaml,dst=/matrix-beeper-linkedin-registration.yaml,ro'] if matrix_bridge_beeper_linkedin_enabled else []) + (['--mount type=bind,src=' + matrix_wechat_config_path + '/registration.yaml,dst=/matrix-wechat-registration.yaml,ro'] if matrix_wechat_enabled else []) + @@ -161,7 +161,7 @@ matrix_homeserver_app_service_config_files_auto: | + (['/matrix-appservice-irc-registration.yaml'] if matrix_bridge_appservice_irc_enabled else []) + - (['/matrix-beeper-linkedin-registration.yaml'] if matrix_beeper_linkedin_enabled else []) + (['/matrix-beeper-linkedin-registration.yaml'] if matrix_bridge_beeper_linkedin_enabled else []) + (['/matrix-wechat-registration.yaml'] if matrix_wechat_enabled else []) + @@ -373,9 +373,9 @@ devture_systemd_service_manager_services_list_auto: | ([{ 'name': 'matrix-beeper-linkedin.service', 'priority': 2000, - 'restart_necessary': (matrix_beeper_linkedin_restart_necessary | bool), + 'restart_necessary': (matrix_bridge_beeper_linkedin_restart_necessary | bool), 'groups': ['matrix', 'bridges', 'beeper-linkedin'], - }] if matrix_beeper_linkedin_enabled else []) + }] if matrix_bridge_beeper_linkedin_enabled else []) + ([{ 'name': 'matrix-wechat.service', @@ -1287,54 +1287,54 @@ matrix_bridge_appservice_irc_container_labels_traefik_tls_certResolver: "{{ trae ###################################################################### # We don't enable bridges by default. -matrix_beeper_linkedin_enabled: false +matrix_bridge_beeper_linkedin_enabled: false -matrix_beeper_linkedin_systemd_required_services_list_auto: | +matrix_bridge_beeper_linkedin_systemd_required_services_list_auto: | {{ matrix_addons_homeserver_systemd_services_list + - ([postgres_identifier ~ '.service'] if (postgres_enabled and matrix_beeper_linkedin_database_hostname == postgres_connection_hostname) else []) + ([postgres_identifier ~ '.service'] if (postgres_enabled and matrix_bridge_beeper_linkedin_database_hostname == postgres_connection_hostname) else []) }} -matrix_beeper_linkedin_container_image_registry_prefix_upstream: "{{ matrix_container_global_registry_prefix_override if matrix_container_global_registry_prefix_override else matrix_beeper_linkedin_container_image_registry_prefix_upstream_default }}" +matrix_bridge_beeper_linkedin_container_image_registry_prefix_upstream: "{{ matrix_container_global_registry_prefix_override if matrix_container_global_registry_prefix_override else matrix_bridge_beeper_linkedin_container_image_registry_prefix_upstream_default }}" -matrix_beeper_linkedin_container_image_self_build: "{{ matrix_architecture not in ['amd64'] }}" +matrix_bridge_beeper_linkedin_container_image_self_build: "{{ matrix_architecture not in ['amd64'] }}" -matrix_beeper_linkedin_container_network: "{{ matrix_addons_container_network }}" +matrix_bridge_beeper_linkedin_container_network: "{{ matrix_addons_container_network }}" -matrix_beeper_linkedin_container_additional_networks_auto: |- +matrix_bridge_beeper_linkedin_container_additional_networks_auto: |- {{ ( ([] if matrix_addons_homeserver_container_network == '' else [matrix_addons_homeserver_container_network]) + - ([postgres_container_network] if (postgres_enabled and matrix_beeper_linkedin_database_hostname == postgres_connection_hostname and matrix_beeper_linkedin_container_network != postgres_container_network) else []) + ([postgres_container_network] if (postgres_enabled and matrix_bridge_beeper_linkedin_database_hostname == postgres_connection_hostname and matrix_bridge_beeper_linkedin_container_network != postgres_container_network) else []) ) | unique }} -matrix_beeper_linkedin_appservice_token: "{{ (matrix_homeserver_generic_secret_key + ':linked.as.token') | hash('sha512') | to_uuid }}" +matrix_bridge_beeper_linkedin_appservice_token: "{{ (matrix_homeserver_generic_secret_key + ':linked.as.token') | hash('sha512') | to_uuid }}" -matrix_beeper_linkedin_homeserver_address: "{{ matrix_addons_homeserver_client_api_url }}" -matrix_beeper_linkedin_homeserver_token: "{{ (matrix_homeserver_generic_secret_key + ':linked.hs.token') | hash('sha512') | to_uuid }}" +matrix_bridge_beeper_linkedin_homeserver_address: "{{ matrix_addons_homeserver_client_api_url }}" +matrix_bridge_beeper_linkedin_homeserver_token: "{{ (matrix_homeserver_generic_secret_key + ':linked.hs.token') | hash('sha512') | to_uuid }}" -matrix_beeper_linkedin_homeserver_async_media: "{{ matrix_homeserver_implementation in ['synapse'] }}" +matrix_bridge_beeper_linkedin_homeserver_async_media: "{{ matrix_homeserver_implementation in ['synapse'] }}" -matrix_beeper_linkedin_bridge_login_shared_secret_map_auto: |- +matrix_bridge_beeper_linkedin_bridge_login_shared_secret_map_auto: |- {{ ({ - matrix_beeper_linkedin_homeserver_domain: ("as_token:" + matrix_appservice_double_puppet_registration_as_token) + matrix_bridge_beeper_linkedin_homeserver_domain: ("as_token:" + matrix_appservice_double_puppet_registration_as_token) }) if matrix_appservice_double_puppet_enabled else ( - {matrix_beeper_linkedin_homeserver_domain: matrix_synapse_ext_password_provider_shared_secret_auth_shared_secret} + {matrix_bridge_beeper_linkedin_homeserver_domain: matrix_synapse_ext_password_provider_shared_secret_auth_shared_secret} if matrix_synapse_ext_password_provider_shared_secret_auth_enabled else {} ) }} -matrix_beeper_linkedin_bridge_presence: "{{ (matrix_synapse_presence_enabled if matrix_synapse_enabled else true) if matrix_homeserver_implementation == 'synapse' else true }}" +matrix_bridge_beeper_linkedin_bridge_presence: "{{ (matrix_synapse_presence_enabled if matrix_synapse_enabled else true) if matrix_homeserver_implementation == 'synapse' else true }}" -matrix_beeper_linkedin_database_hostname: "{{ postgres_connection_hostname if postgres_enabled else '' }}" -matrix_beeper_linkedin_database_password: "{{ (matrix_homeserver_generic_secret_key + ':maulinkedin.db') | hash('sha512') | to_uuid }}" +matrix_bridge_beeper_linkedin_database_hostname: "{{ postgres_connection_hostname if postgres_enabled else '' }}" +matrix_bridge_beeper_linkedin_database_password: "{{ (matrix_homeserver_generic_secret_key + ':maulinkedin.db') | hash('sha512') | to_uuid }}" ###################################################################### # @@ -4159,10 +4159,10 @@ postgres_managed_databases_auto: | }] if (matrix_bridge_appservice_irc_enabled and matrix_bridge_appservice_irc_database_engine == 'postgres' and matrix_bridge_appservice_irc_database_hostname == postgres_connection_hostname) else []) + ([{ - 'name': matrix_beeper_linkedin_database_name, - 'username': matrix_beeper_linkedin_database_username, - 'password': matrix_beeper_linkedin_database_password, - }] if (matrix_beeper_linkedin_enabled and matrix_beeper_linkedin_database_engine == 'postgres' and matrix_beeper_linkedin_database_hostname == postgres_connection_hostname) else []) + 'name': matrix_bridge_beeper_linkedin_database_name, + 'username': matrix_bridge_beeper_linkedin_database_username, + 'password': matrix_bridge_beeper_linkedin_database_password, + }] if (matrix_bridge_beeper_linkedin_enabled and matrix_bridge_beeper_linkedin_database_engine == 'postgres' and matrix_bridge_beeper_linkedin_database_hostname == postgres_connection_hostname) else []) + ([{ 'name': matrix_wechat_database_name, @@ -5103,9 +5103,9 @@ matrix_ketesa_config_asManagedUsers_auto: | ] if matrix_bridge_appservice_discord_enabled else []) + ([ - '^@'+(matrix_beeper_linkedin_appservice_bot_username | default('') | regex_escape)+':'+(matrix_domain | regex_escape)+'$', + '^@'+(matrix_bridge_beeper_linkedin_appservice_bot_username | default('') | regex_escape)+':'+(matrix_domain | regex_escape)+'$', '^@linkedin_[a-zA-Z0-9]+:'+(matrix_domain | regex_escape)+'$', - ] if matrix_beeper_linkedin_enabled else []) + ] if matrix_bridge_beeper_linkedin_enabled else []) + ([ '^@heisenbridge:'+(matrix_domain | regex_escape)+'$', diff --git a/roles/custom/matrix-bridge-beeper-linkedin/defaults/main.yml b/roles/custom/matrix-bridge-beeper-linkedin/defaults/main.yml index 7f21ffdfa..1f342e347 100644 --- a/roles/custom/matrix-bridge-beeper-linkedin/defaults/main.yml +++ b/roles/custom/matrix-bridge-beeper-linkedin/defaults/main.yml @@ -13,163 +13,163 @@ # beeper-linkedin is a Matrix <-> LinkedIn bridge # Project source code URL: https://github.com/beeper/linkedin -matrix_beeper_linkedin_enabled: true +matrix_bridge_beeper_linkedin_enabled: true # renovate: datasource=docker depName=ghcr.io/beeper/linkedin -matrix_beeper_linkedin_version: latest +matrix_bridge_beeper_linkedin_version: latest # See: https://github.com/beeper/linkedin/pkgs/container/linkedin -matrix_beeper_linkedin_container_image: "{{ matrix_beeper_linkedin_container_image_registry_prefix }}beeper/linkedin:{{ matrix_beeper_linkedin_container_image_tag }}" -matrix_beeper_linkedin_container_image_registry_prefix: "{{ 'localhost/' if matrix_beeper_linkedin_container_image_self_build else matrix_beeper_linkedin_container_image_registry_prefix_upstream }}" -matrix_beeper_linkedin_container_image_registry_prefix_upstream: "{{ matrix_beeper_linkedin_container_image_registry_prefix_upstream_default }}" -matrix_beeper_linkedin_container_image_registry_prefix_upstream_default: "ghcr.io/" -matrix_beeper_linkedin_container_image_tag: "{{ 'latest' if matrix_beeper_linkedin_version == 'master' else matrix_beeper_linkedin_version }}" +matrix_bridge_beeper_linkedin_container_image: "{{ matrix_bridge_beeper_linkedin_container_image_registry_prefix }}beeper/linkedin:{{ matrix_bridge_beeper_linkedin_container_image_tag }}" +matrix_bridge_beeper_linkedin_container_image_registry_prefix: "{{ 'localhost/' if matrix_bridge_beeper_linkedin_container_image_self_build else matrix_bridge_beeper_linkedin_container_image_registry_prefix_upstream }}" +matrix_bridge_beeper_linkedin_container_image_registry_prefix_upstream: "{{ matrix_bridge_beeper_linkedin_container_image_registry_prefix_upstream_default }}" +matrix_bridge_beeper_linkedin_container_image_registry_prefix_upstream_default: "ghcr.io/" +matrix_bridge_beeper_linkedin_container_image_tag: "{{ 'latest' if matrix_bridge_beeper_linkedin_version == 'master' else matrix_bridge_beeper_linkedin_version }}" -matrix_beeper_linkedin_container_image_self_build: false -matrix_beeper_linkedin_container_image_self_build_repo: "https://github.com/beeper/linkedin" -matrix_beeper_linkedin_container_image_self_build_branch: "{{ 'master' if matrix_beeper_linkedin_version == 'latest' else matrix_beeper_linkedin_version }}" +matrix_bridge_beeper_linkedin_container_image_self_build: false +matrix_bridge_beeper_linkedin_container_image_self_build_repo: "https://github.com/beeper/linkedin" +matrix_bridge_beeper_linkedin_container_image_self_build_branch: "{{ 'master' if matrix_bridge_beeper_linkedin_version == 'latest' else matrix_bridge_beeper_linkedin_version }}" -matrix_beeper_linkedin_base_path: "{{ matrix_base_data_path }}/beeper-linkedin" -matrix_beeper_linkedin_config_path: "{{ matrix_beeper_linkedin_base_path }}/config" -matrix_beeper_linkedin_data_path: "{{ matrix_beeper_linkedin_base_path }}/data" -matrix_beeper_linkedin_container_src_files_path: "{{ matrix_beeper_linkedin_base_path }}/docker-src" +matrix_bridge_beeper_linkedin_base_path: "{{ matrix_base_data_path }}/beeper-linkedin" +matrix_bridge_beeper_linkedin_config_path: "{{ matrix_bridge_beeper_linkedin_base_path }}/config" +matrix_bridge_beeper_linkedin_data_path: "{{ matrix_bridge_beeper_linkedin_base_path }}/data" +matrix_bridge_beeper_linkedin_container_src_files_path: "{{ matrix_bridge_beeper_linkedin_base_path }}/docker-src" -matrix_beeper_linkedin_homeserver_address: "" -matrix_beeper_linkedin_homeserver_domain: "{{ matrix_domain }}" +matrix_bridge_beeper_linkedin_homeserver_address: "" +matrix_bridge_beeper_linkedin_homeserver_domain: "{{ matrix_domain }}" # Whether asynchronous uploads via MSC2246 should be enabled for media. # Requires a homeserver that supports MSC2246 (https://github.com/matrix-org/matrix-spec-proposals/pull/2246). -matrix_beeper_linkedin_homeserver_async_media: false -matrix_beeper_linkedin_appservice_address: "http://matrix-beeper-linkedin:29319" +matrix_bridge_beeper_linkedin_homeserver_async_media: false +matrix_bridge_beeper_linkedin_appservice_address: "http://matrix-beeper-linkedin:29319" -matrix_beeper_linkedin_bridge_presence: true +matrix_bridge_beeper_linkedin_bridge_presence: true -matrix_beeper_linkedin_bridge_space_support_enable: true +matrix_bridge_beeper_linkedin_bridge_space_support_enable: true -matrix_beeper_linkedin_command_prefix: "!li" +matrix_bridge_beeper_linkedin_command_prefix: "!li" -matrix_beeper_linkedin_bridge_permissions: | +matrix_bridge_beeper_linkedin_bridge_permissions: | {{ - {matrix_beeper_linkedin_homeserver_domain: 'user'} + {matrix_bridge_beeper_linkedin_homeserver_domain: 'user'} | combine({matrix_admin: 'admin'} if matrix_admin else {}) }} -matrix_beeper_linkedin_container_network: "" +matrix_bridge_beeper_linkedin_container_network: "" -matrix_beeper_linkedin_container_additional_networks: "{{ matrix_beeper_linkedin_container_additional_networks_auto + matrix_beeper_linkedin_container_additional_networks_custom }}" -matrix_beeper_linkedin_container_additional_networks_auto: [] -matrix_beeper_linkedin_container_additional_networks_custom: [] +matrix_bridge_beeper_linkedin_container_additional_networks: "{{ matrix_bridge_beeper_linkedin_container_additional_networks_auto + matrix_bridge_beeper_linkedin_container_additional_networks_custom }}" +matrix_bridge_beeper_linkedin_container_additional_networks_auto: [] +matrix_bridge_beeper_linkedin_container_additional_networks_custom: [] # A list of extra arguments to pass to the container -matrix_beeper_linkedin_container_extra_arguments: [] +matrix_bridge_beeper_linkedin_container_extra_arguments: [] # List of systemd services that matrix-beeper-linkedin.service depends on. -matrix_beeper_linkedin_systemd_required_services_list: "{{ matrix_beeper_linkedin_systemd_required_services_list_default + matrix_beeper_linkedin_systemd_required_services_list_auto + matrix_beeper_linkedin_systemd_required_services_list_custom }}" -matrix_beeper_linkedin_systemd_required_services_list_default: "{{ [devture_systemd_docker_base_docker_service_name] if devture_systemd_docker_base_docker_service_name else [] }}" -matrix_beeper_linkedin_systemd_required_services_list_auto: [] -matrix_beeper_linkedin_systemd_required_services_list_custom: [] +matrix_bridge_beeper_linkedin_systemd_required_services_list: "{{ matrix_bridge_beeper_linkedin_systemd_required_services_list_default + matrix_bridge_beeper_linkedin_systemd_required_services_list_auto + matrix_bridge_beeper_linkedin_systemd_required_services_list_custom }}" +matrix_bridge_beeper_linkedin_systemd_required_services_list_default: "{{ [devture_systemd_docker_base_docker_service_name] if devture_systemd_docker_base_docker_service_name else [] }}" +matrix_bridge_beeper_linkedin_systemd_required_services_list_auto: [] +matrix_bridge_beeper_linkedin_systemd_required_services_list_custom: [] # List of systemd services that matrix-beeper-linkedin.service wants -matrix_beeper_linkedin_systemd_wanted_services_list: [] +matrix_bridge_beeper_linkedin_systemd_wanted_services_list: [] -matrix_beeper_linkedin_appservice_token: "" -matrix_beeper_linkedin_homeserver_token: "" +matrix_bridge_beeper_linkedin_appservice_token: "" +matrix_bridge_beeper_linkedin_homeserver_token: "" -matrix_beeper_linkedin_appservice_bot_username: linkedinbot -matrix_beeper_linkedin_appservice_bot_displayname: LinkedIn bridge bot -matrix_beeper_linkedin_appservice_bot_avatar: mxc://nevarro.space/cwsWnmeMpWSMZLUNblJHaIvP +matrix_bridge_beeper_linkedin_appservice_bot_username: linkedinbot +matrix_bridge_beeper_linkedin_appservice_bot_displayname: LinkedIn bridge bot +matrix_bridge_beeper_linkedin_appservice_bot_avatar: mxc://nevarro.space/cwsWnmeMpWSMZLUNblJHaIvP # Database-related configuration fields. # Only Postgres is supported. -matrix_beeper_linkedin_database_engine: "postgres" +matrix_bridge_beeper_linkedin_database_engine: "postgres" -matrix_beeper_linkedin_database_username: 'matrix_beeper_linkedin' -matrix_beeper_linkedin_database_password: 'some-password' -matrix_beeper_linkedin_database_hostname: '' -matrix_beeper_linkedin_database_port: 5432 -matrix_beeper_linkedin_database_name: 'matrix_beeper_linkedin' -matrix_beeper_linkedin_database_sslmode: disable +matrix_bridge_beeper_linkedin_database_username: 'matrix_beeper_linkedin' +matrix_bridge_beeper_linkedin_database_password: 'some-password' +matrix_bridge_beeper_linkedin_database_hostname: '' +matrix_bridge_beeper_linkedin_database_port: 5432 +matrix_bridge_beeper_linkedin_database_name: 'matrix_beeper_linkedin' +matrix_bridge_beeper_linkedin_database_sslmode: disable -matrix_beeper_linkedin_database_connection_string: 'postgresql://{{ matrix_beeper_linkedin_database_username }}:{{ matrix_beeper_linkedin_database_password }}@{{ matrix_beeper_linkedin_database_hostname }}:{{ matrix_beeper_linkedin_database_port }}/{{ matrix_beeper_linkedin_database_name }}?sslmode={{ matrix_beeper_linkedin_database_sslmode }}' +matrix_bridge_beeper_linkedin_database_connection_string: 'postgresql://{{ matrix_bridge_beeper_linkedin_database_username }}:{{ matrix_bridge_beeper_linkedin_database_password }}@{{ matrix_bridge_beeper_linkedin_database_hostname }}:{{ matrix_bridge_beeper_linkedin_database_port }}/{{ matrix_bridge_beeper_linkedin_database_name }}?sslmode={{ matrix_bridge_beeper_linkedin_database_sslmode }}' -matrix_beeper_linkedin_appservice_database_type: "{{ { +matrix_bridge_beeper_linkedin_appservice_database_type: "{{ { 'postgres': 'postgres', -}[matrix_beeper_linkedin_database_engine] }}" +}[matrix_bridge_beeper_linkedin_database_engine] }}" -matrix_beeper_linkedin_appservice_database_uri: "{{ { - 'postgres': matrix_beeper_linkedin_database_connection_string, -}[matrix_beeper_linkedin_database_engine] }}" +matrix_bridge_beeper_linkedin_appservice_database_uri: "{{ { + 'postgres': matrix_bridge_beeper_linkedin_database_connection_string, +}[matrix_bridge_beeper_linkedin_database_engine] }}" -matrix_beeper_linkedin_bridge_login_shared_secret_map: "{{ matrix_beeper_linkedin_bridge_login_shared_secret_map_auto | combine(matrix_beeper_linkedin_bridge_login_shared_secret_map_custom) }}" -matrix_beeper_linkedin_bridge_login_shared_secret_map_auto: {} -matrix_beeper_linkedin_bridge_login_shared_secret_map_custom: {} +matrix_bridge_beeper_linkedin_bridge_login_shared_secret_map: "{{ matrix_bridge_beeper_linkedin_bridge_login_shared_secret_map_auto | combine(matrix_bridge_beeper_linkedin_bridge_login_shared_secret_map_custom) }}" +matrix_bridge_beeper_linkedin_bridge_login_shared_secret_map_auto: {} +matrix_bridge_beeper_linkedin_bridge_login_shared_secret_map_custom: {} # Servers to always allow double puppeting from -matrix_beeper_linkedin_bridge_double_puppet_server_map: "{{ matrix_beeper_linkedin_bridge_double_puppet_server_map_default | combine(matrix_beeper_linkedin_bridge_double_puppet_server_map_auto) | combine(matrix_beeper_linkedin_bridge_double_puppet_server_map_custom) }}" -matrix_beeper_linkedin_bridge_double_puppet_server_map_default: |- +matrix_bridge_beeper_linkedin_bridge_double_puppet_server_map: "{{ matrix_bridge_beeper_linkedin_bridge_double_puppet_server_map_default | combine(matrix_bridge_beeper_linkedin_bridge_double_puppet_server_map_auto) | combine(matrix_bridge_beeper_linkedin_bridge_double_puppet_server_map_custom) }}" +matrix_bridge_beeper_linkedin_bridge_double_puppet_server_map_default: |- {{ {} | combine({ - matrix_beeper_linkedin_homeserver_domain: matrix_beeper_linkedin_homeserver_address + matrix_bridge_beeper_linkedin_homeserver_domain: matrix_bridge_beeper_linkedin_homeserver_address }) }} -matrix_beeper_linkedin_bridge_double_puppet_server_map_auto: {} -matrix_beeper_linkedin_bridge_double_puppet_server_map_custom: {} +matrix_bridge_beeper_linkedin_bridge_double_puppet_server_map_auto: {} +matrix_bridge_beeper_linkedin_bridge_double_puppet_server_map_custom: {} -matrix_beeper_linkedin_provisioning_enabled: false -matrix_beeper_linkedin_provisioning_shared_secret: '' +matrix_bridge_beeper_linkedin_provisioning_enabled: false +matrix_bridge_beeper_linkedin_provisioning_shared_secret: '' # Specifies the default log level for all bridge loggers. -matrix_beeper_linkedin_logging_level: WARNING +matrix_bridge_beeper_linkedin_logging_level: WARNING # Enable End-to-bridge encryption -matrix_beeper_linkedin_bridge_encryption_allow: "{{ matrix_bridges_encryption_enabled }}" -matrix_beeper_linkedin_bridge_encryption_default: "{{ matrix_bridges_encryption_default }}" -matrix_beeper_linkedin_bridge_encryption_appservice: "{{ matrix_beeper_linkedin_bridge_encryption_default }}" -matrix_beeper_linkedin_bridge_encryption_require: false -matrix_beeper_linkedin_bridge_encryption_key_sharing_allow: "{{ matrix_beeper_linkedin_bridge_encryption_allow }}" +matrix_bridge_beeper_linkedin_bridge_encryption_allow: "{{ matrix_bridges_encryption_enabled }}" +matrix_bridge_beeper_linkedin_bridge_encryption_default: "{{ matrix_bridges_encryption_default }}" +matrix_bridge_beeper_linkedin_bridge_encryption_appservice: "{{ matrix_bridge_beeper_linkedin_bridge_encryption_default }}" +matrix_bridge_beeper_linkedin_bridge_encryption_require: false +matrix_bridge_beeper_linkedin_bridge_encryption_key_sharing_allow: "{{ matrix_bridge_beeper_linkedin_bridge_encryption_allow }}" # Default beeper-linkedin configuration template which covers the generic use case. # You can customize it by controlling the various variables inside it. # -# For a more advanced customization, you can extend the default (see `matrix_beeper_linkedin_configuration_extension_yaml`) +# For a more advanced customization, you can extend the default (see `matrix_bridge_beeper_linkedin_configuration_extension_yaml`) # or completely replace this variable with your own template. -matrix_beeper_linkedin_configuration_yaml: "{{ lookup('template', 'templates/config.yaml.j2') }}" +matrix_bridge_beeper_linkedin_configuration_yaml: "{{ lookup('template', 'templates/config.yaml.j2') }}" -matrix_beeper_linkedin_configuration_extension_yaml: | +matrix_bridge_beeper_linkedin_configuration_extension_yaml: | # Your custom YAML configuration goes here. - # This configuration extends the default starting configuration (`matrix_beeper_linkedin_configuration_yaml`). + # This configuration extends the default starting configuration (`matrix_bridge_beeper_linkedin_configuration_yaml`). # # You can override individual variables from the default configuration, or introduce new ones. # # If you need something more special, you can take full control by - # completely redefining `matrix_beeper_linkedin_configuration_yaml`. + # completely redefining `matrix_bridge_beeper_linkedin_configuration_yaml`. -matrix_beeper_linkedin_configuration_extension: "{{ matrix_beeper_linkedin_configuration_extension_yaml | from_yaml if matrix_beeper_linkedin_configuration_extension_yaml | from_yaml is mapping else {} }}" +matrix_bridge_beeper_linkedin_configuration_extension: "{{ matrix_bridge_beeper_linkedin_configuration_extension_yaml | from_yaml if matrix_bridge_beeper_linkedin_configuration_extension_yaml | from_yaml is mapping else {} }}" # Holds the final configuration (a combination of the default and its extension). -# You most likely don't need to touch this variable. Instead, see `matrix_beeper_linkedin_configuration_yaml`. -matrix_beeper_linkedin_configuration: "{{ matrix_beeper_linkedin_configuration_yaml | from_yaml | combine(matrix_beeper_linkedin_configuration_extension, recursive=True) }}" +# You most likely don't need to touch this variable. Instead, see `matrix_bridge_beeper_linkedin_configuration_yaml`. +matrix_bridge_beeper_linkedin_configuration: "{{ matrix_bridge_beeper_linkedin_configuration_yaml | from_yaml | combine(matrix_bridge_beeper_linkedin_configuration_extension, recursive=True) }}" -matrix_beeper_linkedin_registration_yaml: | +matrix_bridge_beeper_linkedin_registration_yaml: | id: beeper_linkedin - url: {{ matrix_beeper_linkedin_appservice_address }} - as_token: "{{ matrix_beeper_linkedin_appservice_token }}" - hs_token: "{{ matrix_beeper_linkedin_homeserver_token }}" + url: {{ matrix_bridge_beeper_linkedin_appservice_address }} + as_token: "{{ matrix_bridge_beeper_linkedin_appservice_token }}" + hs_token: "{{ matrix_bridge_beeper_linkedin_homeserver_token }}" - sender_localpart: _bot_{{ matrix_beeper_linkedin_appservice_bot_username }} + sender_localpart: _bot_{{ matrix_bridge_beeper_linkedin_appservice_bot_username }} rate_limited: false namespaces: users: - - regex: '^@linkedin_.+:{{ matrix_beeper_linkedin_homeserver_domain | regex_escape }}$' + - regex: '^@linkedin_.+:{{ matrix_bridge_beeper_linkedin_homeserver_domain | regex_escape }}$' exclusive: true - exclusive: true - regex: '^@{{ matrix_beeper_linkedin_appservice_bot_username | regex_escape }}:{{ matrix_beeper_linkedin_homeserver_domain | regex_escape }}$' + regex: '^@{{ matrix_bridge_beeper_linkedin_appservice_bot_username | regex_escape }}:{{ matrix_bridge_beeper_linkedin_homeserver_domain | regex_escape }}$' de.sorunome.msc2409.push_ephemeral: true receive_ephemeral: true -matrix_beeper_linkedin_registration: "{{ matrix_beeper_linkedin_registration_yaml | from_yaml }}" +matrix_bridge_beeper_linkedin_registration: "{{ matrix_bridge_beeper_linkedin_registration_yaml | from_yaml }}" -# matrix_beeper_linkedin_restart_necessary controls whether the service +# matrix_bridge_beeper_linkedin_restart_necessary controls whether the service # will be restarted (when true) or merely started (when false) by the # systemd service manager role (when conditional restart is enabled). # @@ -177,4 +177,4 @@ matrix_beeper_linkedin_registration: "{{ matrix_beeper_linkedin_registration_yam # any configuration files, the systemd service file, or the container image changed. # The default of `false` means "no restart needed" — appropriate when the role's # installation tasks haven't run (e.g., due to --tags skipping them). -matrix_beeper_linkedin_restart_necessary: false +matrix_bridge_beeper_linkedin_restart_necessary: false diff --git a/roles/custom/matrix-bridge-beeper-linkedin/tasks/main.yml b/roles/custom/matrix-bridge-beeper-linkedin/tasks/main.yml index 34a4ea3dd..ea7de37b1 100644 --- a/roles/custom/matrix-bridge-beeper-linkedin/tasks/main.yml +++ b/roles/custom/matrix-bridge-beeper-linkedin/tasks/main.yml @@ -12,15 +12,15 @@ - install-all - install-beeper-linkedin block: - - when: matrix_beeper_linkedin_enabled | bool + - when: matrix_bridge_beeper_linkedin_enabled | bool ansible.builtin.include_tasks: "{{ role_path }}/tasks/validate_config.yml" - - when: matrix_beeper_linkedin_enabled | bool + - when: matrix_bridge_beeper_linkedin_enabled | bool ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml" - tags: - setup-all - setup-beeper-linkedin block: - - when: not matrix_beeper_linkedin_enabled | bool + - when: not matrix_bridge_beeper_linkedin_enabled | bool ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml" diff --git a/roles/custom/matrix-bridge-beeper-linkedin/tasks/setup_install.yml b/roles/custom/matrix-bridge-beeper-linkedin/tasks/setup_install.yml index 19cf6f27b..9e668a676 100644 --- a/roles/custom/matrix-bridge-beeper-linkedin/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-beeper-linkedin/tasks/setup_install.yml @@ -19,51 +19,51 @@ owner: "{{ matrix_user_name }}" group: "{{ matrix_group_name }}" with_items: - - {path: "{{ matrix_beeper_linkedin_base_path }}", when: true} - - {path: "{{ matrix_beeper_linkedin_config_path }}", when: true} - - {path: "{{ matrix_beeper_linkedin_data_path }}", when: true} - - {path: "{{ matrix_beeper_linkedin_container_src_files_path }}", when: "{{ matrix_beeper_linkedin_container_image_self_build }}"} + - {path: "{{ matrix_bridge_beeper_linkedin_base_path }}", when: true} + - {path: "{{ matrix_bridge_beeper_linkedin_config_path }}", when: true} + - {path: "{{ matrix_bridge_beeper_linkedin_data_path }}", when: true} + - {path: "{{ matrix_bridge_beeper_linkedin_container_src_files_path }}", when: "{{ matrix_bridge_beeper_linkedin_container_image_self_build }}"} when: "item.when | bool" - name: Ensure beeper-linkedin config.yaml installed ansible.builtin.copy: - content: "{{ matrix_beeper_linkedin_configuration | to_nice_yaml(indent=2, width=999999) }}" - dest: "{{ matrix_beeper_linkedin_config_path }}/config.yaml" + content: "{{ matrix_bridge_beeper_linkedin_configuration | to_nice_yaml(indent=2, width=999999) }}" + dest: "{{ matrix_bridge_beeper_linkedin_config_path }}/config.yaml" mode: '0644' owner: "{{ matrix_user_name }}" group: "{{ matrix_group_name }}" - register: matrix_beeper_linkedin_config_result + register: matrix_bridge_beeper_linkedin_config_result - name: Ensure beeper-linkedin registration.yaml installed ansible.builtin.copy: - content: "{{ matrix_beeper_linkedin_registration | to_nice_yaml(indent=2, width=999999) }}" - dest: "{{ matrix_beeper_linkedin_config_path }}/registration.yaml" + content: "{{ matrix_bridge_beeper_linkedin_registration | to_nice_yaml(indent=2, width=999999) }}" + dest: "{{ matrix_bridge_beeper_linkedin_config_path }}/registration.yaml" mode: '0644' owner: "{{ matrix_user_name }}" group: "{{ matrix_group_name }}" - register: matrix_beeper_linkedin_registration_result + register: matrix_bridge_beeper_linkedin_registration_result - name: Ensure Beeper LinkedIn container image is pulled community.docker.docker_image_pull: - name: "{{ matrix_beeper_linkedin_container_image }}" + name: "{{ matrix_bridge_beeper_linkedin_container_image }}" pull: always - when: "not matrix_beeper_linkedin_container_image_self_build | bool" - register: matrix_beeper_linkedin_container_image_pull_result + when: "not matrix_bridge_beeper_linkedin_container_image_self_build | bool" + register: matrix_bridge_beeper_linkedin_container_image_pull_result retries: "{{ devture_playbook_help_container_retries_count }}" delay: "{{ devture_playbook_help_container_retries_delay }}" - until: matrix_beeper_linkedin_container_image_pull_result is not failed + until: matrix_bridge_beeper_linkedin_container_image_pull_result is not failed -- when: "matrix_beeper_linkedin_container_image_self_build | bool" +- when: "matrix_bridge_beeper_linkedin_container_image_self_build | bool" block: - name: Ensure Beeper LinkedIn repository is present on self-build ansible.builtin.git: - repo: "{{ matrix_beeper_linkedin_container_image_self_build_repo }}" - dest: "{{ matrix_beeper_linkedin_container_src_files_path }}" - version: "{{ matrix_beeper_linkedin_container_image_self_build_branch }}" + repo: "{{ matrix_bridge_beeper_linkedin_container_image_self_build_repo }}" + dest: "{{ matrix_bridge_beeper_linkedin_container_src_files_path }}" + version: "{{ matrix_bridge_beeper_linkedin_container_image_self_build_branch }}" force: "yes" become: true become_user: "{{ matrix_user_name }}" - register: matrix_beeper_linkedin_git_pull_results + register: matrix_bridge_beeper_linkedin_git_pull_results # Building the container image (using the default Dockerfile) requires that a docker-requirements.txt file be generated. # See: https://github.com/beeper/linkedin/blob/94442db17ccb9769b377cdb8e4bf1cb3955781d7/.gitlab-ci.yml#L30-40 @@ -73,29 +73,29 @@ {{ devture_systemd_docker_base_host_command_docker }} run --rm --entrypoint=/bin/sh - --mount type=bind,src={{ matrix_beeper_linkedin_container_src_files_path }},dst=/work + --mount type=bind,src={{ matrix_bridge_beeper_linkedin_container_src_files_path }},dst=/work -w /work docker.io/python:3.9.6-buster -c "pip install poetry && poetry export --without-hashes -E e2be -E images -E metrics | sed 's/==.*//g' > docker-requirements.txt" - register: matrix_beeper_linkedin_generate_docker_requirements_result - changed_when: matrix_beeper_linkedin_generate_docker_requirements_result.rc == 0 + register: matrix_bridge_beeper_linkedin_generate_docker_requirements_result + changed_when: matrix_bridge_beeper_linkedin_generate_docker_requirements_result.rc == 0 - name: Ensure Beeper LinkedIn container image is built community.docker.docker_image_build: - name: "{{ matrix_beeper_linkedin_container_image }}" + name: "{{ matrix_bridge_beeper_linkedin_container_image }}" dockerfile: Dockerfile - path: "{{ matrix_beeper_linkedin_container_src_files_path }}" + path: "{{ matrix_bridge_beeper_linkedin_container_src_files_path }}" pull: true - rebuild: "{{ 'always' if matrix_beeper_linkedin_git_pull_results.changed | bool else 'never' }}" + rebuild: "{{ 'always' if matrix_bridge_beeper_linkedin_git_pull_results.changed | bool else 'never' }}" args: TARGETARCH: "{{ matrix_architecture }}" - register: matrix_beeper_linkedin_container_image_build_result + register: matrix_bridge_beeper_linkedin_container_image_build_result - name: Ensure beeper-linkedin container network is created - when: matrix_beeper_linkedin_container_network != 'host' + when: matrix_bridge_beeper_linkedin_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" - name: "{{ matrix_beeper_linkedin_container_network }}" + name: "{{ matrix_bridge_beeper_linkedin_container_network }}" driver: bridge driver_options: "{{ devture_systemd_docker_base_container_networks_driver_options }}" @@ -104,15 +104,15 @@ src: "{{ role_path }}/templates/systemd/matrix-beeper-linkedin.service.j2" dest: "{{ devture_systemd_docker_base_systemd_path }}/matrix-beeper-linkedin.service" mode: '0644' - register: matrix_beeper_linkedin_systemd_service_result + register: matrix_bridge_beeper_linkedin_systemd_service_result - name: Determine whether matrix-beeper-linkedin needs a restart ansible.builtin.set_fact: - matrix_beeper_linkedin_restart_necessary: >- + matrix_bridge_beeper_linkedin_restart_necessary: >- {{ - matrix_beeper_linkedin_config_result.changed | default(false) - or matrix_beeper_linkedin_registration_result.changed | default(false) - or matrix_beeper_linkedin_systemd_service_result.changed | default(false) - or matrix_beeper_linkedin_container_image_pull_result.changed | default(false) - or matrix_beeper_linkedin_container_image_build_result.changed | default(false) + matrix_bridge_beeper_linkedin_config_result.changed | default(false) + or matrix_bridge_beeper_linkedin_registration_result.changed | default(false) + or matrix_bridge_beeper_linkedin_systemd_service_result.changed | default(false) + or matrix_bridge_beeper_linkedin_container_image_pull_result.changed | default(false) + or matrix_bridge_beeper_linkedin_container_image_build_result.changed | default(false) }} diff --git a/roles/custom/matrix-bridge-beeper-linkedin/tasks/setup_uninstall.yml b/roles/custom/matrix-bridge-beeper-linkedin/tasks/setup_uninstall.yml index aea2f34cf..5b1b45659 100644 --- a/roles/custom/matrix-bridge-beeper-linkedin/tasks/setup_uninstall.yml +++ b/roles/custom/matrix-bridge-beeper-linkedin/tasks/setup_uninstall.yml @@ -9,9 +9,9 @@ - name: Check existence of matrix-beeper-linkedin service ansible.builtin.stat: path: "{{ devture_systemd_docker_base_systemd_path }}/matrix-beeper-linkedin.service" - register: matrix_beeper_linkedin_service_stat + register: matrix_bridge_beeper_linkedin_service_stat -- when: matrix_beeper_linkedin_service_stat.stat.exists | bool +- when: matrix_bridge_beeper_linkedin_service_stat.stat.exists | bool block: - name: Ensure matrix-beeper-linkedin is stopped ansible.builtin.service: diff --git a/roles/custom/matrix-bridge-beeper-linkedin/tasks/validate_config.yml b/roles/custom/matrix-bridge-beeper-linkedin/tasks/validate_config.yml index 7e3982781..0f0b55955 100644 --- a/roles/custom/matrix-bridge-beeper-linkedin/tasks/validate_config.yml +++ b/roles/custom/matrix-bridge-beeper-linkedin/tasks/validate_config.yml @@ -14,16 +14,16 @@ Please rename the variable (`{{ item.old }}` -> `{{ item.new }}`) on your configuration file (vars.yml). when: "lookup('ansible.builtin.varnames', ('^' + item.old + '$'), wantlist=True) | length > 0" with_items: - - {'old': 'matrix_beeper_linkedin_login_shared_secret', 'new': ''} - - {'old': 'matrix_beeper_linkedin_docker_image_name_prefix', 'new': 'matrix_beeper_linkedin_container_image_registry_prefix'} - - {'old': 'matrix_beeper_linkedin_docker_image', 'new': 'matrix_beeper_linkedin_container_image'} - - {'old': 'matrix_beeper_linkedin_docker_image_force_pull', 'new': 'matrix_beeper_linkedin_container_image_force_pull'} - - {'old': 'matrix_beeper_linkedin_docker_image_registry_prefix', 'new': 'matrix_beeper_linkedin_container_image_registry_prefix'} - - {'old': 'matrix_beeper_linkedin_docker_image_registry_prefix_upstream', 'new': 'matrix_beeper_linkedin_container_image_registry_prefix_upstream'} - - {'old': 'matrix_beeper_linkedin_docker_image_registry_prefix_upstream_default', 'new': 'matrix_beeper_linkedin_container_image_registry_prefix_upstream_default'} - - {'old': 'matrix_beeper_linkedin_docker_image_tag', 'new': 'matrix_beeper_linkedin_container_image_tag'} - - {'old': 'matrix_beeper_linkedin_docker_src_files_path', 'new': 'matrix_beeper_linkedin_container_src_files_path'} - - {'old': 'matrix_beeper_linkedin_container_image_force_pull', 'new': ' (the new community.docker.docker_image_pull module handles this natively)'} + - {'old': 'matrix_bridge_beeper_linkedin_login_shared_secret', 'new': ''} + - {'old': 'matrix_bridge_beeper_linkedin_docker_image_name_prefix', 'new': 'matrix_bridge_beeper_linkedin_container_image_registry_prefix'} + - {'old': 'matrix_bridge_beeper_linkedin_docker_image', 'new': 'matrix_bridge_beeper_linkedin_container_image'} + - {'old': 'matrix_bridge_beeper_linkedin_docker_image_force_pull', 'new': 'matrix_bridge_beeper_linkedin_container_image_force_pull'} + - {'old': 'matrix_bridge_beeper_linkedin_docker_image_registry_prefix', 'new': 'matrix_bridge_beeper_linkedin_container_image_registry_prefix'} + - {'old': 'matrix_bridge_beeper_linkedin_docker_image_registry_prefix_upstream', 'new': 'matrix_bridge_beeper_linkedin_container_image_registry_prefix_upstream'} + - {'old': 'matrix_bridge_beeper_linkedin_docker_image_registry_prefix_upstream_default', 'new': 'matrix_bridge_beeper_linkedin_container_image_registry_prefix_upstream_default'} + - {'old': 'matrix_bridge_beeper_linkedin_docker_image_tag', 'new': 'matrix_bridge_beeper_linkedin_container_image_tag'} + - {'old': 'matrix_bridge_beeper_linkedin_docker_src_files_path', 'new': 'matrix_bridge_beeper_linkedin_container_src_files_path'} + - {'old': 'matrix_bridge_beeper_linkedin_container_image_force_pull', 'new': ' (the new community.docker.docker_image_pull module handles this natively)'} - name: Fail if required beeper-linkedin settings not defined ansible.builtin.fail: @@ -31,8 +31,8 @@ You need to define a required configuration setting (`{{ item.name }}`). when: "item.when | bool and lookup('vars', item.name, default='') | string | length == 0" with_items: - - {'name': 'matrix_beeper_linkedin_appservice_token', when: true} - - {'name': 'matrix_beeper_linkedin_homeserver_address', when: true} - - {'name': 'matrix_beeper_linkedin_homeserver_token', when: true} - - {'name': 'matrix_beeper_linkedin_database_hostname', when: "{{ matrix_beeper_linkedin_database_engine == 'postgres' }}"} - - {'name': 'matrix_beeper_linkedin_container_network', when: true} + - {'name': 'matrix_bridge_beeper_linkedin_appservice_token', when: true} + - {'name': 'matrix_bridge_beeper_linkedin_homeserver_address', when: true} + - {'name': 'matrix_bridge_beeper_linkedin_homeserver_token', when: true} + - {'name': 'matrix_bridge_beeper_linkedin_database_hostname', when: "{{ matrix_bridge_beeper_linkedin_database_engine == 'postgres' }}"} + - {'name': 'matrix_bridge_beeper_linkedin_container_network', when: true} diff --git a/roles/custom/matrix-bridge-beeper-linkedin/templates/config.yaml.j2 b/roles/custom/matrix-bridge-beeper-linkedin/templates/config.yaml.j2 index 2213b1fde..4d6fc445b 100644 --- a/roles/custom/matrix-bridge-beeper-linkedin/templates/config.yaml.j2 +++ b/roles/custom/matrix-bridge-beeper-linkedin/templates/config.yaml.j2 @@ -2,9 +2,9 @@ # Homeserver details homeserver: # The address that this appservice can use to connect to the homeserver. - address: {{ matrix_beeper_linkedin_homeserver_address | to_json }} + address: {{ matrix_bridge_beeper_linkedin_homeserver_address | to_json }} # The domain of the homeserver (for MXIDs, etc). - domain: {{ matrix_beeper_linkedin_homeserver_domain | to_json }} + domain: {{ matrix_bridge_beeper_linkedin_homeserver_domain | to_json }} # Whether or not to verify the SSL certificate of the homeserver. # Only applies if address starts with https:// verify_ssl: true @@ -21,13 +21,13 @@ homeserver: message_send_checkpoint_endpoint: null # Whether asynchronous uploads via MSC2246 should be enabled for media. # Requires a media repo that supports MSC2246. - async_media: {{ matrix_beeper_linkedin_homeserver_async_media | to_json }} + async_media: {{ matrix_bridge_beeper_linkedin_homeserver_async_media | to_json }} # Application service host/registration related details # Changing these values requires regeneration of the registration. appservice: # The address that the homeserver can use to connect to this appservice. - address: {{ matrix_beeper_linkedin_appservice_address | to_json }} + address: {{ matrix_bridge_beeper_linkedin_appservice_address | to_json }} # The hostname and port where this appservice should listen. hostname: 0.0.0.0 @@ -40,7 +40,7 @@ appservice: # Format examples: # SQLite: sqlite:filename.db # Postgres: postgres://username:password@hostname/dbname - database: {{ matrix_beeper_linkedin_appservice_database_uri | to_json }} + database: {{ matrix_bridge_beeper_linkedin_appservice_database_uri | to_json }} # Additional arguments for asyncpg.create_pool() or sqlite3.connect() # https://magicstack.github.io/asyncpg/current/api/index.html#asyncpg.pool.create_pool # https://docs.python.org/3/library/sqlite3.html#sqlite3.connect @@ -54,21 +54,21 @@ appservice: # Used by things like mautrix-manager (https://github.com/tulir/mautrix-manager). provisioning: # Whether or not the provisioning API should be enabled. - enabled: {{ matrix_beeper_linkedin_provisioning_enabled | to_json }} + enabled: {{ matrix_bridge_beeper_linkedin_provisioning_enabled | to_json }} # The prefix to use in the provisioning API endpoints. 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: {{ matrix_beeper_linkedin_provisioning_shared_secret | to_json }} + shared_secret: {{ matrix_bridge_beeper_linkedin_provisioning_shared_secret | to_json }} # The unique ID of this appservice. id: beeper_linkedin # Username of the appservice bot. - bot_username: {{ matrix_beeper_linkedin_appservice_bot_username | to_json }} + bot_username: {{ matrix_bridge_beeper_linkedin_appservice_bot_username | to_json }} # Display name and avatar for bot. Set to "remove" to remove display name/avatar, leave empty # to leave display name/avatar as-is. - bot_displayname: {{ matrix_beeper_linkedin_appservice_bot_displayname | to_json(ensure_ascii=False) }} - bot_avatar: {{ matrix_beeper_linkedin_appservice_bot_avatar | to_json }} + bot_displayname: {{ matrix_bridge_beeper_linkedin_appservice_bot_displayname | to_json(ensure_ascii=False) }} + bot_avatar: {{ matrix_bridge_beeper_linkedin_appservice_bot_avatar | to_json }} # Whether or not to receive ephemeral events via appservice transactions. # Requires MSC2409 support (i.e. Synapse 1.22+). @@ -76,8 +76,8 @@ appservice: ephemeral_events: false # Authentication tokens for AS <-> HS communication. Autogenerated; do not modify. - as_token: {{ matrix_beeper_linkedin_appservice_token | to_json }} - hs_token: {{ matrix_beeper_linkedin_homeserver_token | to_json }} + as_token: {{ matrix_bridge_beeper_linkedin_appservice_token | to_json }} + hs_token: {{ matrix_bridge_beeper_linkedin_homeserver_token | to_json }} # Segment-compatible analytics endpoint for tracking some events, like provisioning API login and encryption errors. analytics: @@ -113,7 +113,7 @@ bridge: space_support: # Whether or not to enable creating a space per user and inviting the # user (as well as all of the puppets) to that space. - enable: {{ matrix_beeper_linkedin_bridge_space_support_enable | to_json }} + enable: {{ matrix_bridge_beeper_linkedin_bridge_space_support_enable | to_json }} # The name of the space name: "LinkedIn" # Displayname template for LinkedIn users. @@ -134,7 +134,7 @@ bridge: set_topic_on_dms: true # The prefix for commands. Only required in non-management rooms. - command_prefix: {{ matrix_beeper_linkedin_command_prefix | to_json }} + command_prefix: {{ matrix_bridge_beeper_linkedin_command_prefix | to_json }} # Number of chats to sync (and create portals for) on startup/login. # Set 0 to disable automatic syncing. @@ -150,7 +150,7 @@ bridge: # and is therefore prone to race conditions. sync_direct_chat_list: false # Servers to always allow double puppeting from - double_puppet_server_map: {{ matrix_beeper_linkedin_bridge_double_puppet_server_map | to_json }} + double_puppet_server_map: {{ matrix_bridge_beeper_linkedin_bridge_double_puppet_server_map | to_json }} # Allow using double puppeting from any server with a valid client .well-known file. double_puppet_allow_discovery: false # Shared secrets for https://github.com/devture/matrix-synapse-shared-secret-auth @@ -160,10 +160,10 @@ bridge: # manually. # If using this for other servers than the bridge's server, # you must also set the URL in the double_puppet_server_map. - login_shared_secret_map: {{ matrix_beeper_linkedin_bridge_login_shared_secret_map | to_json }} + login_shared_secret_map: {{ matrix_bridge_beeper_linkedin_bridge_login_shared_secret_map | to_json }} # Whether or not to bridge presence in both directions. LinkedIn allows users not to broadcast # presence, but then it won't send other users' presence to the client. - presence: {{ matrix_beeper_linkedin_bridge_presence | to_json }} + presence: {{ matrix_bridge_beeper_linkedin_bridge_presence | to_json }} # Whether or not to update avatars when syncing all contacts at startup. update_avatar_initial_sync: true # Whether or not created rooms should have federation enabled. @@ -180,17 +180,17 @@ bridge: # See https://docs.mau.fi/bridges/general/end-to-bridge-encryption.html for more info. encryption: # Allow encryption, work in group chat rooms with e2ee enabled - allow: {{ matrix_beeper_linkedin_bridge_encryption_allow | to_json }} + allow: {{ matrix_bridge_beeper_linkedin_bridge_encryption_allow | to_json }} # Default to encryption, force-enable encryption in all portals the bridge creates # This will cause the bridge bot to be in private chats for the encryption to work properly. - default: {{ matrix_beeper_linkedin_bridge_encryption_default | to_json }} + default: {{ matrix_bridge_beeper_linkedin_bridge_encryption_default | to_json }} # Whether to use MSC2409/MSC3202 instead of /sync long polling for receiving encryption-related data. - appservice: {{ matrix_beeper_linkedin_bridge_encryption_appservice | to_json }} + appservice: {{ matrix_bridge_beeper_linkedin_bridge_encryption_appservice | to_json }} # Require encryption, drop any unencrypted messages. - require: {{ matrix_beeper_linkedin_bridge_encryption_require | to_json }} + require: {{ matrix_bridge_beeper_linkedin_bridge_encryption_require | to_json }} # Enable key sharing? If enabled, key requests for rooms where users are in will be fulfilled. # You must use a client that supports requesting keys from other users to use this feature. - allow_key_sharing: {{ matrix_beeper_linkedin_bridge_encryption_key_sharing_allow | to_json }} + allow_key_sharing: {{ matrix_bridge_beeper_linkedin_bridge_encryption_key_sharing_allow | to_json }} # Options for deleting megolm sessions from the bridge. delete_keys: # Beeper-specific: delete outbound sessions when hungryserv confirms @@ -314,7 +314,7 @@ bridge: # * - All Matrix users # domain - All users on that homeserver # mxid - Specific user - permissions: {{ matrix_beeper_linkedin_bridge_permissions | to_json }} + permissions: {{ matrix_bridge_beeper_linkedin_bridge_permissions | to_json }} # Python logging configuration. # @@ -334,9 +334,9 @@ logging: formatter: colored loggers: mau: - level: {{ matrix_beeper_linkedin_logging_level|to_json }} + level: {{ matrix_bridge_beeper_linkedin_logging_level|to_json }} aiohttp: - level: {{ matrix_beeper_linkedin_logging_level|to_json }} + level: {{ matrix_bridge_beeper_linkedin_logging_level|to_json }} root: level: DEBUG handlers: [console] diff --git a/roles/custom/matrix-bridge-beeper-linkedin/templates/systemd/matrix-beeper-linkedin.service.j2 b/roles/custom/matrix-bridge-beeper-linkedin/templates/systemd/matrix-beeper-linkedin.service.j2 index 65f796a80..faf4aa61d 100644 --- a/roles/custom/matrix-bridge-beeper-linkedin/templates/systemd/matrix-beeper-linkedin.service.j2 +++ b/roles/custom/matrix-bridge-beeper-linkedin/templates/systemd/matrix-beeper-linkedin.service.j2 @@ -1,11 +1,11 @@ #jinja2: lstrip_blocks: True [Unit] Description=Matrix Beeper Linkedin bridge -{% for service in matrix_beeper_linkedin_systemd_required_services_list %} +{% for service in matrix_bridge_beeper_linkedin_systemd_required_services_list %} Requires={{ service }} After={{ service }} {% endfor %} -{% for service in matrix_beeper_linkedin_systemd_wanted_services_list %} +{% for service in matrix_bridge_beeper_linkedin_systemd_wanted_services_list %} Wants={{ service }} {% endfor %} DefaultDependencies=no @@ -22,17 +22,17 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ --log-driver=none \ --user={{ matrix_user_uid }}:{{ matrix_user_gid }} \ --cap-drop=ALL \ - --network={{ matrix_beeper_linkedin_container_network }} \ - --mount type=bind,src={{ matrix_beeper_linkedin_config_path }},dst=/config,ro \ + --network={{ matrix_bridge_beeper_linkedin_container_network }} \ + --mount type=bind,src={{ matrix_bridge_beeper_linkedin_config_path }},dst=/config,ro \ --workdir=/opt/linkedin-matrix \ - {% for arg in matrix_beeper_linkedin_container_extra_arguments %} + {% for arg in matrix_bridge_beeper_linkedin_container_extra_arguments %} {{ arg }} \ {% endfor %} - {{ matrix_beeper_linkedin_container_image }} \ + {{ matrix_bridge_beeper_linkedin_container_image }} \ python3 -m linkedin_matrix -c /config/config.yaml -r /config/registration.yaml --no-update -{% if matrix_beeper_linkedin_container_network != 'host' %} -{% for network in matrix_beeper_linkedin_container_additional_networks %} +{% if matrix_bridge_beeper_linkedin_container_network != 'host' %} +{% for network in matrix_bridge_beeper_linkedin_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-beeper-linkedin {% endfor %} {% endif %} diff --git a/roles/custom/matrix-bridge-mautrix-discord/defaults/main.yml b/roles/custom/matrix-bridge-mautrix-discord/defaults/main.yml index 9d0b9eacf..ac393ab06 100644 --- a/roles/custom/matrix-bridge-mautrix-discord/defaults/main.yml +++ b/roles/custom/matrix-bridge-mautrix-discord/defaults/main.yml @@ -181,7 +181,7 @@ matrix_mautrix_discord_bridge_double_puppet_server_map_default: |- {{ {} | combine({ - matrix_beeper_linkedin_homeserver_domain: matrix_beeper_linkedin_homeserver_address + matrix_bridge_beeper_linkedin_homeserver_domain: matrix_bridge_beeper_linkedin_homeserver_address }) }} matrix_mautrix_discord_bridge_double_puppet_server_map_auto: {}