From 6768ada899d8f416bfa272eb3f85c37f50bc1904 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Thu, 16 Jul 2026 14:49:42 +0300 Subject: [PATCH] Rename matrix_mautrix_bluesky_* variables to matrix_bridge_mautrix_bluesky_* 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-mautrix-bluesky.md | 4 +- group_vars/matrix_servers | 86 +++---- .../defaults/main.yml | 236 +++++++++--------- .../tasks/main.yml | 6 +- .../tasks/setup_install.yml | 78 +++--- .../tasks/setup_uninstall.yml | 4 +- .../tasks/validate_config.yml | 30 +-- .../templates/config.yaml.j2 | 58 ++--- .../templates/labels.j2 | 46 ++-- .../systemd/matrix-mautrix-bluesky.service.j2 | 20 +- 10 files changed, 284 insertions(+), 284 deletions(-) diff --git a/docs/configuring-playbook-bridge-mautrix-bluesky.md b/docs/configuring-playbook-bridge-mautrix-bluesky.md index 3a9c07303..db5d32de0 100644 --- a/docs/configuring-playbook-bridge-mautrix-bluesky.md +++ b/docs/configuring-playbook-bridge-mautrix-bluesky.md @@ -27,7 +27,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_mautrix_bluesky_enabled: true +matrix_bridge_mautrix_bluesky_enabled: true ``` ### Extending the configuration @@ -70,5 +70,5 @@ The default logging level for this component is `warn`. If you want to increase ```yaml # Valid values: fatal, error, warn, info, debug, trace -matrix_mautrix_bluesky_logging_level: 'debug' +matrix_bridge_mautrix_bluesky_logging_level: 'debug' ``` diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers index 0624c123d..d4a57c141 100755 --- a/group_vars/matrix_servers +++ b/group_vars/matrix_servers @@ -110,7 +110,7 @@ matrix_homeserver_container_extra_arguments_auto: | + (['--mount type=bind,src=' + matrix_bridge_hookshot_base_path + '/registration.yml,dst=/hookshot-registration.yml,ro'] if matrix_bridge_hookshot_enabled else []) + - (['--mount type=bind,src=' + matrix_mautrix_bluesky_config_path + '/registration.yaml,dst=/matrix-mautrix-bluesky-registration.yaml,ro'] if matrix_mautrix_bluesky_enabled else []) + (['--mount type=bind,src=' + matrix_bridge_mautrix_bluesky_config_path + '/registration.yaml,dst=/matrix-mautrix-bluesky-registration.yaml,ro'] if matrix_bridge_mautrix_bluesky_enabled else []) + (['--mount type=bind,src=' + matrix_rustpush_bridge_config_path + '/registration.yaml,dst=/matrix-rustpush-bridge-registration.yaml,ro'] if matrix_rustpush_bridge_enabled else []) + @@ -169,7 +169,7 @@ matrix_homeserver_app_service_config_files_auto: | + (['/hookshot-registration.yml'] if matrix_bridge_hookshot_enabled else []) + - (['/matrix-mautrix-bluesky-registration.yaml'] if matrix_mautrix_bluesky_enabled else []) + (['/matrix-mautrix-bluesky-registration.yaml'] if matrix_bridge_mautrix_bluesky_enabled else []) + (['/matrix-rustpush-bridge-registration.yaml'] if matrix_rustpush_bridge_enabled else []) + @@ -415,9 +415,9 @@ devture_systemd_service_manager_services_list_auto: | ([{ 'name': 'matrix-mautrix-bluesky.service', 'priority': 2000, - 'restart_necessary': (matrix_mautrix_bluesky_restart_necessary | bool), + 'restart_necessary': (matrix_bridge_mautrix_bluesky_restart_necessary | bool), 'groups': ['matrix', 'bridges', 'mautrix-bluesky'], - }] if matrix_mautrix_bluesky_enabled else []) + }] if matrix_bridge_mautrix_bluesky_enabled else []) + ([{ 'name': 'matrix-rustpush-bridge.service', @@ -1349,71 +1349,71 @@ matrix_bridge_beeper_linkedin_database_password: "{{ (matrix_homeserver_generic_ ###################################################################### # We don't enable bridges by default. -matrix_mautrix_bluesky_enabled: false +matrix_bridge_mautrix_bluesky_enabled: false -matrix_mautrix_bluesky_systemd_required_services_list_auto: | +matrix_bridge_mautrix_bluesky_systemd_required_services_list_auto: | {{ matrix_addons_homeserver_systemd_services_list + - ([postgres_identifier ~ '.service'] if (postgres_enabled and matrix_mautrix_bluesky_database_hostname == postgres_connection_hostname) else []) + ([postgres_identifier ~ '.service'] if (postgres_enabled and matrix_bridge_mautrix_bluesky_database_hostname == postgres_connection_hostname) else []) }} -matrix_mautrix_bluesky_container_image_registry_prefix_upstream: "{{ matrix_container_global_registry_prefix_override if matrix_container_global_registry_prefix_override else matrix_mautrix_bluesky_container_image_registry_prefix_upstream_default }}" +matrix_bridge_mautrix_bluesky_container_image_registry_prefix_upstream: "{{ matrix_container_global_registry_prefix_override if matrix_container_global_registry_prefix_override else matrix_bridge_mautrix_bluesky_container_image_registry_prefix_upstream_default }}" -matrix_mautrix_bluesky_container_image_self_build: "{{ matrix_architecture not in ['amd64', 'arm64'] }}" +matrix_bridge_mautrix_bluesky_container_image_self_build: "{{ matrix_architecture not in ['amd64', 'arm64'] }}" -matrix_mautrix_bluesky_container_network: "{{ matrix_addons_container_network }}" +matrix_bridge_mautrix_bluesky_container_network: "{{ matrix_addons_container_network }}" -matrix_mautrix_bluesky_container_additional_networks_auto: |- +matrix_bridge_mautrix_bluesky_container_additional_networks_auto: |- {{ ( ([] if matrix_addons_homeserver_container_network == '' else [matrix_addons_homeserver_container_network]) + - ([postgres_container_network] if (postgres_enabled and matrix_mautrix_bluesky_database_hostname == postgres_connection_hostname and matrix_mautrix_bluesky_container_network != postgres_container_network) else []) + ([postgres_container_network] if (postgres_enabled and matrix_bridge_mautrix_bluesky_database_hostname == postgres_connection_hostname and matrix_bridge_mautrix_bluesky_container_network != postgres_container_network) else []) + - ([matrix_playbook_reverse_proxyable_services_additional_network] if matrix_playbook_reverse_proxyable_services_additional_network and matrix_mautrix_bluesky_container_labels_traefik_enabled else []) + ([matrix_playbook_reverse_proxyable_services_additional_network] if matrix_playbook_reverse_proxyable_services_additional_network and matrix_bridge_mautrix_bluesky_container_labels_traefik_enabled else []) ) | unique }} -matrix_mautrix_bluesky_container_labels_traefik_enabled: "{{ matrix_playbook_reverse_proxy_type in ['playbook-managed-traefik', 'other-traefik-container'] }}" -matrix_mautrix_bluesky_container_labels_traefik_docker_network: "{{ matrix_playbook_reverse_proxyable_services_additional_network }}" -matrix_mautrix_bluesky_container_labels_traefik_entrypoints: "{{ traefik_entrypoint_primary }}" -matrix_mautrix_bluesky_container_labels_traefik_tls_certResolver: "{{ traefik_certResolver_primary }}" +matrix_bridge_mautrix_bluesky_container_labels_traefik_enabled: "{{ matrix_playbook_reverse_proxy_type in ['playbook-managed-traefik', 'other-traefik-container'] }}" +matrix_bridge_mautrix_bluesky_container_labels_traefik_docker_network: "{{ matrix_playbook_reverse_proxyable_services_additional_network }}" +matrix_bridge_mautrix_bluesky_container_labels_traefik_entrypoints: "{{ traefik_entrypoint_primary }}" +matrix_bridge_mautrix_bluesky_container_labels_traefik_tls_certResolver: "{{ traefik_certResolver_primary }}" -matrix_mautrix_bluesky_container_labels_metrics_middleware_basic_auth_enabled: "{{ matrix_metrics_exposure_http_basic_auth_enabled }}" -matrix_mautrix_bluesky_container_labels_metrics_middleware_basic_auth_users: "{{ matrix_metrics_exposure_http_basic_auth_users }}" +matrix_bridge_mautrix_bluesky_container_labels_metrics_middleware_basic_auth_enabled: "{{ matrix_metrics_exposure_http_basic_auth_enabled }}" +matrix_bridge_mautrix_bluesky_container_labels_metrics_middleware_basic_auth_users: "{{ matrix_metrics_exposure_http_basic_auth_users }}" -matrix_mautrix_bluesky_appservice_token: "{{ (matrix_homeserver_generic_secret_key + ':bsky.as.token') | hash('sha512') | to_uuid }}" +matrix_bridge_mautrix_bluesky_appservice_token: "{{ (matrix_homeserver_generic_secret_key + ':bsky.as.token') | hash('sha512') | to_uuid }}" -matrix_mautrix_bluesky_homeserver_address: "{{ matrix_addons_homeserver_client_api_url }}" -matrix_mautrix_bluesky_homeserver_token: "{{ (matrix_homeserver_generic_secret_key + ':bsky.hs.token') | hash('sha512') | to_uuid }}" +matrix_bridge_mautrix_bluesky_homeserver_address: "{{ matrix_addons_homeserver_client_api_url }}" +matrix_bridge_mautrix_bluesky_homeserver_token: "{{ (matrix_homeserver_generic_secret_key + ':bsky.hs.token') | hash('sha512') | to_uuid }}" -matrix_mautrix_bluesky_homeserver_async_media: "{{ matrix_homeserver_implementation in ['synapse'] }}" +matrix_bridge_mautrix_bluesky_homeserver_async_media: "{{ matrix_homeserver_implementation in ['synapse'] }}" -matrix_mautrix_bluesky_provisioning_shared_secret: "{{ (matrix_homeserver_generic_secret_key + ':mau.bsky.prov') | hash('sha512') | to_uuid }}" +matrix_bridge_mautrix_bluesky_provisioning_shared_secret: "{{ (matrix_homeserver_generic_secret_key + ':mau.bsky.prov') | hash('sha512') | to_uuid }}" -matrix_mautrix_bluesky_double_puppet_secrets_auto: |- +matrix_bridge_mautrix_bluesky_double_puppet_secrets_auto: |- {{ ({ - matrix_mautrix_bluesky_homeserver_domain: ("as_token:" + matrix_appservice_double_puppet_registration_as_token) + matrix_bridge_mautrix_bluesky_homeserver_domain: ("as_token:" + matrix_appservice_double_puppet_registration_as_token) }) if matrix_appservice_double_puppet_enabled else {} }} -matrix_mautrix_bluesky_metrics_enabled: "{{ prometheus_enabled or matrix_metrics_exposure_enabled }}" +matrix_bridge_mautrix_bluesky_metrics_enabled: "{{ prometheus_enabled or matrix_metrics_exposure_enabled }}" -matrix_mautrix_bluesky_metrics_proxying_enabled: "{{ matrix_mautrix_bluesky_metrics_enabled and matrix_metrics_exposure_enabled }}" -matrix_mautrix_bluesky_metrics_proxying_hostname: "{{ matrix_metrics_exposure_hostname }}" -matrix_mautrix_bluesky_metrics_proxying_path_prefix: "{{ matrix_metrics_exposure_path_prefix }}/mautrix-bluesky" +matrix_bridge_mautrix_bluesky_metrics_proxying_enabled: "{{ matrix_bridge_mautrix_bluesky_metrics_enabled and matrix_metrics_exposure_enabled }}" +matrix_bridge_mautrix_bluesky_metrics_proxying_hostname: "{{ matrix_metrics_exposure_hostname }}" +matrix_bridge_mautrix_bluesky_metrics_proxying_path_prefix: "{{ matrix_metrics_exposure_path_prefix }}/mautrix-bluesky" -matrix_mautrix_bluesky_scheme: "{{ 'https' if matrix_playbook_ssl_enabled else 'http' }}" -matrix_mautrix_bluesky_exposure_enabled: "{{ matrix_bridges_exposure_enabled }}" -matrix_mautrix_bluesky_exposure_hostname: "{{ matrix_bridges_exposure_hostname }}" -matrix_mautrix_bluesky_exposure_path_prefix: "{{ matrix_bridges_exposure_path_prefix }}/bluesky" +matrix_bridge_mautrix_bluesky_scheme: "{{ 'https' if matrix_playbook_ssl_enabled else 'http' }}" +matrix_bridge_mautrix_bluesky_exposure_enabled: "{{ matrix_bridges_exposure_enabled }}" +matrix_bridge_mautrix_bluesky_exposure_hostname: "{{ matrix_bridges_exposure_hostname }}" +matrix_bridge_mautrix_bluesky_exposure_path_prefix: "{{ matrix_bridges_exposure_path_prefix }}/bluesky" -matrix_mautrix_bluesky_database_hostname: "{{ postgres_connection_hostname if postgres_enabled else '' }}" -matrix_mautrix_bluesky_database_password: "{{ (matrix_homeserver_generic_secret_key + ':mau.twt.db') | hash('sha512') | to_uuid if postgres_enabled else '' }}" +matrix_bridge_mautrix_bluesky_database_hostname: "{{ postgres_connection_hostname if postgres_enabled else '' }}" +matrix_bridge_mautrix_bluesky_database_password: "{{ (matrix_homeserver_generic_secret_key + ':mau.twt.db') | hash('sha512') | to_uuid if postgres_enabled else '' }}" ###################################################################### # @@ -4171,10 +4171,10 @@ postgres_managed_databases_auto: | }] if (matrix_wechat_enabled and matrix_wechat_database_engine == 'postgres' and matrix_wechat_database_hostname == postgres_connection_hostname) else []) + ([{ - 'name': matrix_mautrix_bluesky_database_name, - 'username': matrix_mautrix_bluesky_database_username, - 'password': matrix_mautrix_bluesky_database_password, - }] if (matrix_mautrix_bluesky_enabled and matrix_mautrix_bluesky_database_engine == 'postgres' and matrix_mautrix_bluesky_database_hostname == postgres_connection_hostname) else []) + 'name': matrix_bridge_mautrix_bluesky_database_name, + 'username': matrix_bridge_mautrix_bluesky_database_username, + 'password': matrix_bridge_mautrix_bluesky_database_password, + }] if (matrix_bridge_mautrix_bluesky_enabled and matrix_bridge_mautrix_bluesky_database_engine == 'postgres' and matrix_bridge_mautrix_bluesky_database_hostname == postgres_connection_hostname) else []) + ([{ 'name': matrix_rustpush_bridge_database_name, @@ -5121,9 +5121,9 @@ matrix_ketesa_config_asManagedUsers_auto: | ] if matrix_bridge_hookshot_enabled else []) + ([ - '^@'+(matrix_mautrix_bluesky_appservice_bot_username | default('') | regex_escape)+':'+(matrix_domain | regex_escape)+'$', + '^@'+(matrix_bridge_mautrix_bluesky_appservice_bot_username | default('') | regex_escape)+':'+(matrix_domain | regex_escape)+'$', '^@bluesky_[a-zA-Z0-9]+:'+(matrix_domain | regex_escape)+'$', - ] if matrix_mautrix_bluesky_enabled else []) + ] if matrix_bridge_mautrix_bluesky_enabled else []) + ([ '^@'+(matrix_rustpush_bridge_appservice_bot_username | default('') | regex_escape)+':'+(matrix_domain | regex_escape)+'$', @@ -6012,7 +6012,7 @@ matrix_static_files_file_matrix_client_property_org_matrix_msc4143_rtc_foci_auto matrix_static_files_file_matrix_mautrix_property_fi_mau_bridges_auto: |- {{ [ - matrix_mautrix_bluesky_appservice_public_address if (matrix_mautrix_bluesky_enabled and matrix_mautrix_bluesky_container_labels_traefik_enabled and matrix_mautrix_bluesky_container_labels_exposure_enabled) else '', + matrix_bridge_mautrix_bluesky_appservice_public_address if (matrix_bridge_mautrix_bluesky_enabled and matrix_bridge_mautrix_bluesky_container_labels_traefik_enabled and matrix_bridge_mautrix_bluesky_container_labels_exposure_enabled) else '', matrix_mautrix_gmessages_bridge_public_address if (matrix_mautrix_gmessages_enabled and matrix_mautrix_gmessages_container_labels_traefik_enabled and matrix_mautrix_gmessages_container_labels_exposure_enabled) else '', matrix_mautrix_gvoice_bridge_public_address if (matrix_mautrix_gvoice_enabled and matrix_mautrix_gvoice_container_labels_traefik_enabled and matrix_mautrix_gvoice_container_labels_exposure_enabled) else '', matrix_mautrix_meta_instagram_bridge_public_address if (matrix_mautrix_meta_instagram_enabled and matrix_mautrix_meta_instagram_container_labels_traefik_enabled and matrix_mautrix_meta_instagram_container_labels_exposure_enabled) else '', diff --git a/roles/custom/matrix-bridge-mautrix-bluesky/defaults/main.yml b/roles/custom/matrix-bridge-mautrix-bluesky/defaults/main.yml index c55441159..f4c3e8c91 100644 --- a/roles/custom/matrix-bridge-mautrix-bluesky/defaults/main.yml +++ b/roles/custom/matrix-bridge-mautrix-bluesky/defaults/main.yml @@ -7,225 +7,225 @@ # mautrix-bluesky is a Matrix <-> Bluesky bridge # Project source code URL: https://github.com/mautrix/bluesky -matrix_mautrix_bluesky_enabled: true +matrix_bridge_mautrix_bluesky_enabled: true -matrix_mautrix_bluesky_container_image_self_build: false -matrix_mautrix_bluesky_container_image_self_build_repo: "https://github.com/mautrix/bluesky.git" -matrix_mautrix_bluesky_container_image_self_build_repo_version: "{{ 'master' if matrix_mautrix_bluesky_version == 'latest' else matrix_mautrix_bluesky_version }}" +matrix_bridge_mautrix_bluesky_container_image_self_build: false +matrix_bridge_mautrix_bluesky_container_image_self_build_repo: "https://github.com/mautrix/bluesky.git" +matrix_bridge_mautrix_bluesky_container_image_self_build_repo_version: "{{ 'master' if matrix_bridge_mautrix_bluesky_version == 'latest' else matrix_bridge_mautrix_bluesky_version }}" # renovate: datasource=docker depName=dock.mau.dev/mautrix/bluesky -matrix_mautrix_bluesky_version: v0.2510.0 +matrix_bridge_mautrix_bluesky_version: v0.2510.0 # See: https://mau.dev/tulir/mautrix-bluesky/container_registry -matrix_mautrix_bluesky_container_image: "{{ matrix_mautrix_bluesky_container_image_registry_prefix }}mautrix/bluesky:{{ matrix_mautrix_bluesky_version }}" -matrix_mautrix_bluesky_container_image_registry_prefix: "{{ 'localhost/' if matrix_mautrix_bluesky_container_image_self_build else matrix_mautrix_bluesky_container_image_registry_prefix_upstream }}" -matrix_mautrix_bluesky_container_image_registry_prefix_upstream: "{{ matrix_mautrix_bluesky_container_image_registry_prefix_upstream_default }}" -matrix_mautrix_bluesky_container_image_registry_prefix_upstream_default: "dock.mau.dev/" +matrix_bridge_mautrix_bluesky_container_image: "{{ matrix_bridge_mautrix_bluesky_container_image_registry_prefix }}mautrix/bluesky:{{ matrix_bridge_mautrix_bluesky_version }}" +matrix_bridge_mautrix_bluesky_container_image_registry_prefix: "{{ 'localhost/' if matrix_bridge_mautrix_bluesky_container_image_self_build else matrix_bridge_mautrix_bluesky_container_image_registry_prefix_upstream }}" +matrix_bridge_mautrix_bluesky_container_image_registry_prefix_upstream: "{{ matrix_bridge_mautrix_bluesky_container_image_registry_prefix_upstream_default }}" +matrix_bridge_mautrix_bluesky_container_image_registry_prefix_upstream_default: "dock.mau.dev/" -matrix_mautrix_bluesky_base_path: "{{ matrix_base_data_path }}/mautrix-bluesky" -matrix_mautrix_bluesky_config_path: "{{ matrix_mautrix_bluesky_base_path }}/config" -matrix_mautrix_bluesky_data_path: "{{ matrix_mautrix_bluesky_base_path }}/data" -matrix_mautrix_bluesky_container_src_files_path: "{{ matrix_mautrix_bluesky_base_path }}/docker-src" +matrix_bridge_mautrix_bluesky_base_path: "{{ matrix_base_data_path }}/mautrix-bluesky" +matrix_bridge_mautrix_bluesky_config_path: "{{ matrix_bridge_mautrix_bluesky_base_path }}/config" +matrix_bridge_mautrix_bluesky_data_path: "{{ matrix_bridge_mautrix_bluesky_base_path }}/data" +matrix_bridge_mautrix_bluesky_container_src_files_path: "{{ matrix_bridge_mautrix_bluesky_base_path }}/docker-src" -matrix_mautrix_bluesky_homeserver_address: "" +matrix_bridge_mautrix_bluesky_homeserver_address: "" # 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_mautrix_bluesky_homeserver_async_media: false -matrix_mautrix_bluesky_homeserver_domain: '{{ matrix_domain }}' -matrix_mautrix_bluesky_appservice_address: 'http://matrix-mautrix-bluesky:29340' +matrix_bridge_mautrix_bluesky_homeserver_async_media: false +matrix_bridge_mautrix_bluesky_homeserver_domain: '{{ matrix_domain }}' +matrix_bridge_mautrix_bluesky_appservice_address: 'http://matrix-mautrix-bluesky:29340' -matrix_mautrix_bluesky_msc4190_enabled: "{{ matrix_bridges_msc4190_enabled }}" -matrix_mautrix_bluesky_self_sign_enabled: "{{ matrix_bridges_self_sign_enabled }}" +matrix_bridge_mautrix_bluesky_msc4190_enabled: "{{ matrix_bridges_msc4190_enabled }}" +matrix_bridge_mautrix_bluesky_self_sign_enabled: "{{ matrix_bridges_self_sign_enabled }}" -# Scheme of the bridge's public address (see `matrix_mautrix_bluesky_appservice_public_address`). -matrix_mautrix_bluesky_scheme: https +# Scheme of the bridge's public address (see `matrix_bridge_mautrix_bluesky_appservice_public_address`). +matrix_bridge_mautrix_bluesky_scheme: https # A public address that external services can use to reach this appservice (when exposed). # Used for the provisioning API's external-server (OpenID) flow and for public media links. -matrix_mautrix_bluesky_appservice_public_address: "{{ (matrix_mautrix_bluesky_scheme + '://' + matrix_mautrix_bluesky_exposure_hostname + matrix_mautrix_bluesky_exposure_path_prefix) if matrix_mautrix_bluesky_exposure_enabled else '' }}" +matrix_bridge_mautrix_bluesky_appservice_public_address: "{{ (matrix_bridge_mautrix_bluesky_scheme + '://' + matrix_bridge_mautrix_bluesky_exposure_hostname + matrix_bridge_mautrix_bluesky_exposure_path_prefix) if matrix_bridge_mautrix_bluesky_exposure_enabled else '' }}" # Displayname template for Bluesky users. # {{ .DisplayName }} is replaced with the display name of the Bluesky user. # {{ .Username }} is replaced with the username of the Bluesky user. -matrix_mautrix_bluesky_network_displayname_template: "{% raw %}{{ .DisplayName }}{% endraw %} (Bluesky)" +matrix_bridge_mautrix_bluesky_network_displayname_template: "{% raw %}{{ .DisplayName }}{% endraw %} (Bluesky)" -matrix_mautrix_bluesky_bridge_command_prefix: "!bs" +matrix_bridge_mautrix_bluesky_bridge_command_prefix: "!bs" -matrix_mautrix_bluesky_bridge_permissions: | +matrix_bridge_mautrix_bluesky_bridge_permissions: | {{ - {matrix_mautrix_bluesky_homeserver_domain: 'user'} + {matrix_bridge_mautrix_bluesky_homeserver_domain: 'user'} | combine({matrix_admin: 'admin'} if matrix_admin else {}) }} -matrix_mautrix_bluesky_container_network: "" +matrix_bridge_mautrix_bluesky_container_network: "" -matrix_mautrix_bluesky_container_additional_networks: "{{ matrix_mautrix_bluesky_container_additional_networks_auto + matrix_mautrix_bluesky_container_additional_networks_custom }}" -matrix_mautrix_bluesky_container_additional_networks_auto: [] -matrix_mautrix_bluesky_container_additional_networks_custom: [] +matrix_bridge_mautrix_bluesky_container_additional_networks: "{{ matrix_bridge_mautrix_bluesky_container_additional_networks_auto + matrix_bridge_mautrix_bluesky_container_additional_networks_custom }}" +matrix_bridge_mautrix_bluesky_container_additional_networks_auto: [] +matrix_bridge_mautrix_bluesky_container_additional_networks_custom: [] -# matrix_mautrix_bluesky_container_labels_traefik_enabled controls whether labels to assist a Traefik reverse-proxy will be attached to the container. +# matrix_bridge_mautrix_bluesky_container_labels_traefik_enabled controls whether labels to assist a Traefik reverse-proxy will be attached to the container. # See `../templates/labels.j2` for details. # -# To inject your own other container labels, see `matrix_mautrix_bluesky_container_labels_additional_labels`. -matrix_mautrix_bluesky_container_labels_traefik_enabled: true -matrix_mautrix_bluesky_container_labels_traefik_docker_network: "{{ matrix_mautrix_bluesky_container_network }}" -matrix_mautrix_bluesky_container_labels_traefik_entrypoints: web-secure -matrix_mautrix_bluesky_container_labels_traefik_tls_certResolver: default # noqa var-naming +# To inject your own other container labels, see `matrix_bridge_mautrix_bluesky_container_labels_additional_labels`. +matrix_bridge_mautrix_bluesky_container_labels_traefik_enabled: true +matrix_bridge_mautrix_bluesky_container_labels_traefik_docker_network: "{{ matrix_bridge_mautrix_bluesky_container_network }}" +matrix_bridge_mautrix_bluesky_container_labels_traefik_entrypoints: web-secure +matrix_bridge_mautrix_bluesky_container_labels_traefik_tls_certResolver: default # noqa var-naming # Controls whether labels will be added that expose mautrix-instagram's metrics -matrix_mautrix_bluesky_container_labels_metrics_enabled: "{{ matrix_mautrix_bluesky_metrics_enabled and matrix_mautrix_bluesky_metrics_proxying_enabled }}" -matrix_mautrix_bluesky_container_labels_metrics_traefik_rule: "Host(`{{ matrix_mautrix_bluesky_metrics_proxying_hostname }}`) && PathPrefix(`{{ matrix_mautrix_bluesky_metrics_proxying_path_prefix }}`)" -matrix_mautrix_bluesky_container_labels_metrics_traefik_priority: 0 -matrix_mautrix_bluesky_container_labels_metrics_traefik_entrypoints: "{{ matrix_mautrix_bluesky_container_labels_traefik_entrypoints }}" -matrix_mautrix_bluesky_container_labels_metrics_traefik_tls: "{{ matrix_mautrix_bluesky_container_labels_metrics_traefik_entrypoints != 'web' }}" -matrix_mautrix_bluesky_container_labels_metrics_traefik_tls_certResolver: "{{ matrix_mautrix_bluesky_container_labels_traefik_tls_certResolver }}" # noqa var-naming -matrix_mautrix_bluesky_container_labels_metrics_middleware_basic_auth_enabled: false +matrix_bridge_mautrix_bluesky_container_labels_metrics_enabled: "{{ matrix_bridge_mautrix_bluesky_metrics_enabled and matrix_bridge_mautrix_bluesky_metrics_proxying_enabled }}" +matrix_bridge_mautrix_bluesky_container_labels_metrics_traefik_rule: "Host(`{{ matrix_bridge_mautrix_bluesky_metrics_proxying_hostname }}`) && PathPrefix(`{{ matrix_bridge_mautrix_bluesky_metrics_proxying_path_prefix }}`)" +matrix_bridge_mautrix_bluesky_container_labels_metrics_traefik_priority: 0 +matrix_bridge_mautrix_bluesky_container_labels_metrics_traefik_entrypoints: "{{ matrix_bridge_mautrix_bluesky_container_labels_traefik_entrypoints }}" +matrix_bridge_mautrix_bluesky_container_labels_metrics_traefik_tls: "{{ matrix_bridge_mautrix_bluesky_container_labels_metrics_traefik_entrypoints != 'web' }}" +matrix_bridge_mautrix_bluesky_container_labels_metrics_traefik_tls_certResolver: "{{ matrix_bridge_mautrix_bluesky_container_labels_traefik_tls_certResolver }}" # noqa var-naming +matrix_bridge_mautrix_bluesky_container_labels_metrics_middleware_basic_auth_enabled: false # See: https://doc.traefik.io/traefik/middlewares/http/basicauth/#users -matrix_mautrix_bluesky_container_labels_metrics_middleware_basic_auth_users: '' +matrix_bridge_mautrix_bluesky_container_labels_metrics_middleware_basic_auth_users: '' # Controls whether labels will be added that expose mautrix-bluesky's HTTP API # (used by tools like mautrix-manager for bridge login) at `https://`. -matrix_mautrix_bluesky_container_labels_exposure_enabled: "{{ matrix_mautrix_bluesky_exposure_enabled }}" -matrix_mautrix_bluesky_container_labels_exposure_traefik_rule: "Host(`{{ matrix_mautrix_bluesky_exposure_hostname }}`) && PathPrefix(`{{ matrix_mautrix_bluesky_exposure_path_prefix }}`)" -matrix_mautrix_bluesky_container_labels_exposure_traefik_priority: 0 -matrix_mautrix_bluesky_container_labels_exposure_traefik_entrypoints: "{{ matrix_mautrix_bluesky_container_labels_traefik_entrypoints }}" -matrix_mautrix_bluesky_container_labels_exposure_traefik_tls: "{{ matrix_mautrix_bluesky_container_labels_exposure_traefik_entrypoints != 'web' }}" -matrix_mautrix_bluesky_container_labels_exposure_traefik_tls_certResolver: "{{ matrix_mautrix_bluesky_container_labels_traefik_tls_certResolver }}" # noqa var-naming +matrix_bridge_mautrix_bluesky_container_labels_exposure_enabled: "{{ matrix_bridge_mautrix_bluesky_exposure_enabled }}" +matrix_bridge_mautrix_bluesky_container_labels_exposure_traefik_rule: "Host(`{{ matrix_bridge_mautrix_bluesky_exposure_hostname }}`) && PathPrefix(`{{ matrix_bridge_mautrix_bluesky_exposure_path_prefix }}`)" +matrix_bridge_mautrix_bluesky_container_labels_exposure_traefik_priority: 0 +matrix_bridge_mautrix_bluesky_container_labels_exposure_traefik_entrypoints: "{{ matrix_bridge_mautrix_bluesky_container_labels_traefik_entrypoints }}" +matrix_bridge_mautrix_bluesky_container_labels_exposure_traefik_tls: "{{ matrix_bridge_mautrix_bluesky_container_labels_exposure_traefik_entrypoints != 'web' }}" +matrix_bridge_mautrix_bluesky_container_labels_exposure_traefik_tls_certResolver: "{{ matrix_bridge_mautrix_bluesky_container_labels_traefik_tls_certResolver }}" # noqa var-naming -# matrix_mautrix_bluesky_container_labels_additional_labels contains a multiline string with additional labels to add to the container label file. +# matrix_bridge_mautrix_bluesky_container_labels_additional_labels contains a multiline string with additional labels to add to the container label file. # See `../templates/labels.j2` for details. # # Example: -# matrix_mautrix_bluesky_container_labels_additional_labels: | +# matrix_bridge_mautrix_bluesky_container_labels_additional_labels: | # my.label=1 # another.label="here" -matrix_mautrix_bluesky_container_labels_additional_labels: '' +matrix_bridge_mautrix_bluesky_container_labels_additional_labels: '' # A list of extra arguments to pass to the container -matrix_mautrix_bluesky_container_extra_arguments: [] +matrix_bridge_mautrix_bluesky_container_extra_arguments: [] # List of systemd services that matrix-mautrix-bluesky.service depends on. -matrix_mautrix_bluesky_systemd_required_services_list: "{{ matrix_mautrix_bluesky_systemd_required_services_list_default + matrix_mautrix_bluesky_systemd_required_services_list_auto + matrix_mautrix_bluesky_systemd_required_services_list_custom }}" -matrix_mautrix_bluesky_systemd_required_services_list_default: "{{ [devture_systemd_docker_base_docker_service_name] if devture_systemd_docker_base_docker_service_name else [] }}" -matrix_mautrix_bluesky_systemd_required_services_list_auto: [] -matrix_mautrix_bluesky_systemd_required_services_list_custom: [] +matrix_bridge_mautrix_bluesky_systemd_required_services_list: "{{ matrix_bridge_mautrix_bluesky_systemd_required_services_list_default + matrix_bridge_mautrix_bluesky_systemd_required_services_list_auto + matrix_bridge_mautrix_bluesky_systemd_required_services_list_custom }}" +matrix_bridge_mautrix_bluesky_systemd_required_services_list_default: "{{ [devture_systemd_docker_base_docker_service_name] if devture_systemd_docker_base_docker_service_name else [] }}" +matrix_bridge_mautrix_bluesky_systemd_required_services_list_auto: [] +matrix_bridge_mautrix_bluesky_systemd_required_services_list_custom: [] # List of systemd services that matrix-mautrix-bluesky.service wants -matrix_mautrix_bluesky_systemd_wanted_services_list: [] +matrix_bridge_mautrix_bluesky_systemd_wanted_services_list: [] -matrix_mautrix_bluesky_appservice_token: '' -matrix_mautrix_bluesky_homeserver_token: '' +matrix_bridge_mautrix_bluesky_appservice_token: '' +matrix_bridge_mautrix_bluesky_homeserver_token: '' # Whether or not created rooms should have federation enabled. # If false, created portal rooms will never be federated. -matrix_mautrix_bluesky_matrix_federate_rooms: true +matrix_bridge_mautrix_bluesky_matrix_federate_rooms: true # Database-related configuration fields. # # To use Postgres: -# - adjust your database credentials via the `matrix_mautrix_bluesky_postgres_*` variables -matrix_mautrix_bluesky_database_engine: 'postgres' +# - adjust your database credentials via the `matrix_bridge_mautrix_bluesky_postgres_*` variables +matrix_bridge_mautrix_bluesky_database_engine: 'postgres' -matrix_mautrix_bluesky_database_username: 'matrix_mautrix_bluesky' -matrix_mautrix_bluesky_database_password: 'some-password' -matrix_mautrix_bluesky_database_hostname: '' -matrix_mautrix_bluesky_database_port: 5432 -matrix_mautrix_bluesky_database_name: 'matrix_mautrix_bluesky' -matrix_mautrix_bluesky_database_sslmode: disable +matrix_bridge_mautrix_bluesky_database_username: 'matrix_mautrix_bluesky' +matrix_bridge_mautrix_bluesky_database_password: 'some-password' +matrix_bridge_mautrix_bluesky_database_hostname: '' +matrix_bridge_mautrix_bluesky_database_port: 5432 +matrix_bridge_mautrix_bluesky_database_name: 'matrix_mautrix_bluesky' +matrix_bridge_mautrix_bluesky_database_sslmode: disable -matrix_mautrix_bluesky_database_connection_string: 'postgres://{{ matrix_mautrix_bluesky_database_username }}:{{ matrix_mautrix_bluesky_database_password }}@{{ matrix_mautrix_bluesky_database_hostname }}:{{ matrix_mautrix_bluesky_database_port }}/{{ matrix_mautrix_bluesky_database_name }}?sslmode={{ matrix_mautrix_bluesky_database_sslmode }}' +matrix_bridge_mautrix_bluesky_database_connection_string: 'postgres://{{ matrix_bridge_mautrix_bluesky_database_username }}:{{ matrix_bridge_mautrix_bluesky_database_password }}@{{ matrix_bridge_mautrix_bluesky_database_hostname }}:{{ matrix_bridge_mautrix_bluesky_database_port }}/{{ matrix_bridge_mautrix_bluesky_database_name }}?sslmode={{ matrix_bridge_mautrix_bluesky_database_sslmode }}' -matrix_mautrix_bluesky_database_uri: "{{ { - 'postgres': matrix_mautrix_bluesky_database_connection_string, -}[matrix_mautrix_bluesky_database_engine] }}" +matrix_bridge_mautrix_bluesky_database_uri: "{{ { + 'postgres': matrix_bridge_mautrix_bluesky_database_connection_string, +}[matrix_bridge_mautrix_bluesky_database_engine] }}" -matrix_mautrix_bluesky_double_puppet_secrets: "{{ matrix_mautrix_bluesky_double_puppet_secrets_auto | combine(matrix_mautrix_bluesky_double_puppet_secrets_custom) }}" -matrix_mautrix_bluesky_double_puppet_secrets_auto: {} -matrix_mautrix_bluesky_double_puppet_secrets_custom: {} +matrix_bridge_mautrix_bluesky_double_puppet_secrets: "{{ matrix_bridge_mautrix_bluesky_double_puppet_secrets_auto | combine(matrix_bridge_mautrix_bluesky_double_puppet_secrets_custom) }}" +matrix_bridge_mautrix_bluesky_double_puppet_secrets_auto: {} +matrix_bridge_mautrix_bluesky_double_puppet_secrets_custom: {} -matrix_mautrix_bluesky_appservice_bot_username: blueskybot -matrix_mautrix_bluesky_appservice_bot_displayname: Bluesky bridge bot -matrix_mautrix_bluesky_appservice_bot_avatar: mxc://maunium.net/ezAjjDxhiJWGEohmhkpfeHYf +matrix_bridge_mautrix_bluesky_appservice_bot_username: blueskybot +matrix_bridge_mautrix_bluesky_appservice_bot_displayname: Bluesky bridge bot +matrix_bridge_mautrix_bluesky_appservice_bot_avatar: mxc://maunium.net/ezAjjDxhiJWGEohmhkpfeHYf -matrix_mautrix_bluesky_backfill_enabled: true +matrix_bridge_mautrix_bluesky_backfill_enabled: true # Maximum number of messages to backfill in empty rooms -matrix_mautrix_bluesky_backfill_max_initial_messages: 50 +matrix_bridge_mautrix_bluesky_backfill_max_initial_messages: 50 # Maximum number of missed messages to backfill after bridge restarts -matrix_mautrix_bluesky_backfill_max_catchup_messages: 500 +matrix_bridge_mautrix_bluesky_backfill_max_catchup_messages: 500 # Shared secret for authentication of provisioning API requests. # If set to "disable", the provisioning API will be disabled. -matrix_mautrix_bluesky_provisioning_shared_secret: disable +matrix_bridge_mautrix_bluesky_provisioning_shared_secret: disable # Minimum severity of journal log messages. # Valid values: fatal, error, warn, info, debug, trace -matrix_mautrix_bluesky_logging_level: 'warn' +matrix_bridge_mautrix_bluesky_logging_level: 'warn' # 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_bluesky_metrics_proxying_enabled`. -matrix_mautrix_bluesky_metrics_enabled: false +# If metrics need to be consumed by another (external) Prometheus server, consider exposing them via `matrix_bridge_mautrix_bluesky_metrics_proxying_enabled`. +matrix_bridge_mautrix_bluesky_metrics_enabled: false # Controls whether metrics should be exposed on a public URL. -matrix_mautrix_bluesky_metrics_proxying_enabled: false -matrix_mautrix_bluesky_metrics_proxying_hostname: '' -matrix_mautrix_bluesky_metrics_proxying_path_prefix: '' +matrix_bridge_mautrix_bluesky_metrics_proxying_enabled: false +matrix_bridge_mautrix_bluesky_metrics_proxying_hostname: '' +matrix_bridge_mautrix_bluesky_metrics_proxying_path_prefix: '' # Controls whether mautrix-bluesky's HTTP API is exposed publicly (used by tools like mautrix-manager for bridge login). -matrix_mautrix_bluesky_exposure_enabled: false -matrix_mautrix_bluesky_exposure_hostname: '' -matrix_mautrix_bluesky_exposure_path_prefix: '' +matrix_bridge_mautrix_bluesky_exposure_enabled: false +matrix_bridge_mautrix_bluesky_exposure_hostname: '' +matrix_bridge_mautrix_bluesky_exposure_path_prefix: '' # Default 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_mautrix_bluesky_configuration_extension_yaml`) +# For a more advanced customization, you can extend the default (see `matrix_bridge_mautrix_bluesky_configuration_extension_yaml`) # or completely replace this variable with your own template. -matrix_mautrix_bluesky_configuration_yaml: "{{ lookup('template', 'templates/config.yaml.j2') }}" +matrix_bridge_mautrix_bluesky_configuration_yaml: "{{ lookup('template', 'templates/config.yaml.j2') }}" -matrix_mautrix_bluesky_configuration_extension_yaml: | +matrix_bridge_mautrix_bluesky_configuration_extension_yaml: | # Your custom YAML configuration goes here. - # This configuration extends the default starting configuration (`matrix_mautrix_bluesky_configuration_yaml`). + # This configuration extends the default starting configuration (`matrix_bridge_mautrix_bluesky_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_mautrix_bluesky_configuration_yaml`. + # completely redefining `matrix_bridge_mautrix_bluesky_configuration_yaml`. -matrix_mautrix_bluesky_configuration_extension: "{{ matrix_mautrix_bluesky_configuration_extension_yaml | from_yaml if matrix_mautrix_bluesky_configuration_extension_yaml | from_yaml is mapping else {} }}" +matrix_bridge_mautrix_bluesky_configuration_extension: "{{ matrix_bridge_mautrix_bluesky_configuration_extension_yaml | from_yaml if matrix_bridge_mautrix_bluesky_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_mautrix_bluesky_configuration_yaml`. -matrix_mautrix_bluesky_configuration: "{{ matrix_mautrix_bluesky_configuration_yaml | from_yaml | combine(matrix_mautrix_bluesky_configuration_extension, recursive=True) }}" +# You most likely don't need to touch this variable. Instead, see `matrix_bridge_mautrix_bluesky_configuration_yaml`. +matrix_bridge_mautrix_bluesky_configuration: "{{ matrix_bridge_mautrix_bluesky_configuration_yaml | from_yaml | combine(matrix_bridge_mautrix_bluesky_configuration_extension, recursive=True) }}" -matrix_mautrix_bluesky_registration_yaml: | +matrix_bridge_mautrix_bluesky_registration_yaml: | id: bluesky - as_token: "{{ matrix_mautrix_bluesky_appservice_token }}" - hs_token: "{{ matrix_mautrix_bluesky_homeserver_token }}" + as_token: "{{ matrix_bridge_mautrix_bluesky_appservice_token }}" + hs_token: "{{ matrix_bridge_mautrix_bluesky_homeserver_token }}" namespaces: users: - exclusive: true - regex: '^@bluesky_.+:{{ matrix_mautrix_bluesky_homeserver_domain | regex_escape }}$' + regex: '^@bluesky_.+:{{ matrix_bridge_mautrix_bluesky_homeserver_domain | regex_escape }}$' - exclusive: true - regex: '^@{{ matrix_mautrix_bluesky_appservice_bot_username | regex_escape }}:{{ matrix_mautrix_bluesky_homeserver_domain | regex_escape }}$' - url: {{ matrix_mautrix_bluesky_appservice_address }} - sender_localpart: _bot_{{ matrix_mautrix_bluesky_appservice_bot_username }} + regex: '^@{{ matrix_bridge_mautrix_bluesky_appservice_bot_username | regex_escape }}:{{ matrix_bridge_mautrix_bluesky_homeserver_domain | regex_escape }}$' + url: {{ matrix_bridge_mautrix_bluesky_appservice_address }} + sender_localpart: _bot_{{ matrix_bridge_mautrix_bluesky_appservice_bot_username }} rate_limited: false de.sorunome.msc2409.push_ephemeral: true receive_ephemeral: true - io.element.msc4190: {{ matrix_mautrix_bluesky_msc4190_enabled | to_json }} + io.element.msc4190: {{ matrix_bridge_mautrix_bluesky_msc4190_enabled | to_json }} -matrix_mautrix_bluesky_registration: "{{ matrix_mautrix_bluesky_registration_yaml | from_yaml }}" +matrix_bridge_mautrix_bluesky_registration: "{{ matrix_bridge_mautrix_bluesky_registration_yaml | from_yaml }}" # Enable End-to-bridge encryption -matrix_mautrix_bluesky_bridge_encryption_allow: "{{ matrix_bridges_encryption_enabled }}" -matrix_mautrix_bluesky_bridge_encryption_default: "{{ matrix_bridges_encryption_default }}" -matrix_mautrix_bluesky_bridge_encryption_require: false -matrix_mautrix_bluesky_bridge_encryption_appservice: false -matrix_mautrix_bluesky_bridge_encryption_key_sharing_allow: "{{ matrix_mautrix_bluesky_bridge_encryption_allow }}" -matrix_mautrix_bluesky_bridge_encryption_pickle_key: mautrix.bridge.e2ee +matrix_bridge_mautrix_bluesky_bridge_encryption_allow: "{{ matrix_bridges_encryption_enabled }}" +matrix_bridge_mautrix_bluesky_bridge_encryption_default: "{{ matrix_bridges_encryption_default }}" +matrix_bridge_mautrix_bluesky_bridge_encryption_require: false +matrix_bridge_mautrix_bluesky_bridge_encryption_appservice: false +matrix_bridge_mautrix_bluesky_bridge_encryption_key_sharing_allow: "{{ matrix_bridge_mautrix_bluesky_bridge_encryption_allow }}" +matrix_bridge_mautrix_bluesky_bridge_encryption_pickle_key: mautrix.bridge.e2ee -# matrix_mautrix_bluesky_restart_necessary controls whether the service +# matrix_bridge_mautrix_bluesky_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). # @@ -233,4 +233,4 @@ matrix_mautrix_bluesky_bridge_encryption_pickle_key: mautrix.bridge.e2ee # 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_mautrix_bluesky_restart_necessary: false +matrix_bridge_mautrix_bluesky_restart_necessary: false diff --git a/roles/custom/matrix-bridge-mautrix-bluesky/tasks/main.yml b/roles/custom/matrix-bridge-mautrix-bluesky/tasks/main.yml index 0071485aa..abfab10b1 100644 --- a/roles/custom/matrix-bridge-mautrix-bluesky/tasks/main.yml +++ b/roles/custom/matrix-bridge-mautrix-bluesky/tasks/main.yml @@ -10,15 +10,15 @@ - install-all - install-mautrix-bluesky block: - - when: matrix_mautrix_bluesky_enabled | bool + - when: matrix_bridge_mautrix_bluesky_enabled | bool ansible.builtin.include_tasks: "{{ role_path }}/tasks/validate_config.yml" - - when: matrix_mautrix_bluesky_enabled | bool + - when: matrix_bridge_mautrix_bluesky_enabled | bool ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml" - tags: - setup-all - setup-mautrix-bluesky block: - - when: not matrix_mautrix_bluesky_enabled | bool + - when: not matrix_bridge_mautrix_bluesky_enabled | bool ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml" diff --git a/roles/custom/matrix-bridge-mautrix-bluesky/tasks/setup_install.yml b/roles/custom/matrix-bridge-mautrix-bluesky/tasks/setup_install.yml index 70f991728..263dd2219 100644 --- a/roles/custom/matrix-bridge-mautrix-bluesky/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-mautrix-bluesky/tasks/setup_install.yml @@ -5,17 +5,17 @@ --- - ansible.builtin.set_fact: - matrix_mautrix_bluesky_migration_requires_restart: false + matrix_bridge_mautrix_bluesky_migration_requires_restart: false - name: Ensure Mautrix Bluesky image is pulled community.docker.docker_image_pull: - name: "{{ matrix_mautrix_bluesky_container_image }}" + name: "{{ matrix_bridge_mautrix_bluesky_container_image }}" pull: always - when: matrix_mautrix_bluesky_enabled | bool and not matrix_mautrix_bluesky_container_image_self_build - register: matrix_mautrix_bluesky_container_image_pull_result + when: matrix_bridge_mautrix_bluesky_enabled | bool and not matrix_bridge_mautrix_bluesky_container_image_self_build + register: matrix_bridge_mautrix_bluesky_container_image_pull_result retries: "{{ devture_playbook_help_container_retries_count }}" delay: "{{ devture_playbook_help_container_retries_delay }}" - until: matrix_mautrix_bluesky_container_image_pull_result is not failed + until: matrix_bridge_mautrix_bluesky_container_image_pull_result is not failed - name: Ensure Mautrix Bluesky paths exist ansible.builtin.file: @@ -25,67 +25,67 @@ owner: "{{ matrix_user_name }}" group: "{{ matrix_group_name }}" with_items: - - {path: "{{ matrix_mautrix_bluesky_base_path }}", when: true} - - {path: "{{ matrix_mautrix_bluesky_config_path }}", when: true} - - {path: "{{ matrix_mautrix_bluesky_data_path }}", when: true} - - {path: "{{ matrix_mautrix_bluesky_container_src_files_path }}", when: "{{ matrix_mautrix_bluesky_container_image_self_build }}"} + - {path: "{{ matrix_bridge_mautrix_bluesky_base_path }}", when: true} + - {path: "{{ matrix_bridge_mautrix_bluesky_config_path }}", when: true} + - {path: "{{ matrix_bridge_mautrix_bluesky_data_path }}", when: true} + - {path: "{{ matrix_bridge_mautrix_bluesky_container_src_files_path }}", when: "{{ matrix_bridge_mautrix_bluesky_container_image_self_build }}"} when: item.when | bool - name: Ensure Mautrix Bluesky repository is present on self-build ansible.builtin.git: - repo: "{{ matrix_mautrix_bluesky_container_image_self_build_repo }}" - version: "{{ matrix_mautrix_bluesky_container_image_self_build_repo_version }}" - dest: "{{ matrix_mautrix_bluesky_container_src_files_path }}" + repo: "{{ matrix_bridge_mautrix_bluesky_container_image_self_build_repo }}" + version: "{{ matrix_bridge_mautrix_bluesky_container_image_self_build_repo_version }}" + dest: "{{ matrix_bridge_mautrix_bluesky_container_src_files_path }}" force: "yes" become: true become_user: "{{ matrix_user_name }}" - register: matrix_mautrix_bluesky_git_pull_results - when: "matrix_mautrix_bluesky_enabled | bool and matrix_mautrix_bluesky_container_image_self_build" + register: matrix_bridge_mautrix_bluesky_git_pull_results + when: "matrix_bridge_mautrix_bluesky_enabled | bool and matrix_bridge_mautrix_bluesky_container_image_self_build" - name: Ensure Mautrix Bluesky Docker image is built community.docker.docker_image_build: - name: "{{ matrix_mautrix_bluesky_container_image }}" + name: "{{ matrix_bridge_mautrix_bluesky_container_image }}" dockerfile: Dockerfile - path: "{{ matrix_mautrix_bluesky_container_src_files_path }}" + path: "{{ matrix_bridge_mautrix_bluesky_container_src_files_path }}" pull: true - rebuild: "{{ 'always' if matrix_mautrix_bluesky_git_pull_results.changed | bool else 'never' }}" - when: "matrix_mautrix_bluesky_enabled | bool and matrix_mautrix_bluesky_container_image_self_build | bool" - register: matrix_mautrix_bluesky_container_image_build_result + rebuild: "{{ 'always' if matrix_bridge_mautrix_bluesky_git_pull_results.changed | bool else 'never' }}" + when: "matrix_bridge_mautrix_bluesky_enabled | bool and matrix_bridge_mautrix_bluesky_container_image_self_build | bool" + register: matrix_bridge_mautrix_bluesky_container_image_build_result - name: Ensure mautrix-bluesky config.yaml installed ansible.builtin.copy: - content: "{{ matrix_mautrix_bluesky_configuration | to_nice_yaml(indent=2, width=999999) }}" - dest: "{{ matrix_mautrix_bluesky_config_path }}/config.yaml" + content: "{{ matrix_bridge_mautrix_bluesky_configuration | to_nice_yaml(indent=2, width=999999) }}" + dest: "{{ matrix_bridge_mautrix_bluesky_config_path }}/config.yaml" mode: '0644' owner: "{{ matrix_user_name }}" group: "{{ matrix_group_name }}" - register: matrix_mautrix_bluesky_config_result + register: matrix_bridge_mautrix_bluesky_config_result - name: Ensure mautrix-bluesky registration.yaml installed ansible.builtin.copy: - content: "{{ matrix_mautrix_bluesky_registration | to_nice_yaml(indent=2, width=999999) }}" - dest: "{{ matrix_mautrix_bluesky_config_path }}/registration.yaml" + content: "{{ matrix_bridge_mautrix_bluesky_registration | to_nice_yaml(indent=2, width=999999) }}" + dest: "{{ matrix_bridge_mautrix_bluesky_config_path }}/registration.yaml" mode: '0644' owner: "{{ matrix_user_name }}" group: "{{ matrix_group_name }}" - register: matrix_mautrix_bluesky_registration_result + register: matrix_bridge_mautrix_bluesky_registration_result - name: Ensure mautrix-bluesky support files installed ansible.builtin.template: src: "{{ role_path }}/templates/{{ item }}.j2" - dest: "{{ matrix_mautrix_bluesky_base_path }}/{{ item }}" + dest: "{{ matrix_bridge_mautrix_bluesky_base_path }}/{{ item }}" mode: '0640' owner: "{{ matrix_user_name }}" group: "{{ matrix_group_name }}" with_items: - labels - register: matrix_mautrix_bluesky_support_files_result + register: matrix_bridge_mautrix_bluesky_support_files_result - name: Ensure matrix-mautrix-bluesky container network is created - when: matrix_mautrix_bluesky_container_network != 'host' + when: matrix_bridge_mautrix_bluesky_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" - name: "{{ matrix_mautrix_bluesky_container_network }}" + name: "{{ matrix_bridge_mautrix_bluesky_container_network }}" driver: bridge driver_options: "{{ devture_systemd_docker_base_container_networks_driver_options }}" @@ -94,19 +94,19 @@ src: "{{ role_path }}/templates/systemd/matrix-mautrix-bluesky.service.j2" dest: "{{ devture_systemd_docker_base_systemd_path }}/matrix-mautrix-bluesky.service" mode: '0644' - register: matrix_mautrix_bluesky_systemd_service_result + register: matrix_bridge_mautrix_bluesky_systemd_service_result - name: Determine whether matrix-mautrix-bluesky needs a restart ansible.builtin.set_fact: - matrix_mautrix_bluesky_restart_necessary: >- + matrix_bridge_mautrix_bluesky_restart_necessary: >- {{ - matrix_mautrix_bluesky_migration_requires_restart | default(false) - or matrix_mautrix_bluesky_config_result.changed | default(false) - or matrix_mautrix_bluesky_registration_result.changed | default(false) - or matrix_mautrix_bluesky_support_files_result.changed | default(false) - or matrix_mautrix_bluesky_systemd_service_result.changed | default(false) - or matrix_mautrix_bluesky_container_image_pull_result.changed | default(false) - or matrix_mautrix_bluesky_container_image_build_result.changed | default(false) + matrix_bridge_mautrix_bluesky_migration_requires_restart | default(false) + or matrix_bridge_mautrix_bluesky_config_result.changed | default(false) + or matrix_bridge_mautrix_bluesky_registration_result.changed | default(false) + or matrix_bridge_mautrix_bluesky_support_files_result.changed | default(false) + or matrix_bridge_mautrix_bluesky_systemd_service_result.changed | default(false) + or matrix_bridge_mautrix_bluesky_container_image_pull_result.changed | default(false) + or matrix_bridge_mautrix_bluesky_container_image_build_result.changed | default(false) }} - name: Ensure matrix-mautrix-bluesky.service restarted, if necessary @@ -114,4 +114,4 @@ name: "matrix-mautrix-bluesky.service" state: restarted daemon_reload: true - when: "matrix_mautrix_bluesky_migration_requires_restart | bool" + when: "matrix_bridge_mautrix_bluesky_migration_requires_restart | bool" diff --git a/roles/custom/matrix-bridge-mautrix-bluesky/tasks/setup_uninstall.yml b/roles/custom/matrix-bridge-mautrix-bluesky/tasks/setup_uninstall.yml index e38cd26c9..a324b7b06 100644 --- a/roles/custom/matrix-bridge-mautrix-bluesky/tasks/setup_uninstall.yml +++ b/roles/custom/matrix-bridge-mautrix-bluesky/tasks/setup_uninstall.yml @@ -7,9 +7,9 @@ - name: Check existence of matrix-mautrix-bluesky service ansible.builtin.stat: path: "{{ devture_systemd_docker_base_systemd_path }}/matrix-mautrix-bluesky.service" - register: matrix_mautrix_bluesky_service_stat + register: matrix_bridge_mautrix_bluesky_service_stat -- when: matrix_mautrix_bluesky_service_stat.stat.exists | bool +- when: matrix_bridge_mautrix_bluesky_service_stat.stat.exists | bool block: - name: Ensure matrix-mautrix-bluesky is stopped ansible.builtin.service: diff --git a/roles/custom/matrix-bridge-mautrix-bluesky/tasks/validate_config.yml b/roles/custom/matrix-bridge-mautrix-bluesky/tasks/validate_config.yml index 781494642..8abf45014 100644 --- a/roles/custom/matrix-bridge-mautrix-bluesky/tasks/validate_config.yml +++ b/roles/custom/matrix-bridge-mautrix-bluesky/tasks/validate_config.yml @@ -13,14 +13,14 @@ 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_mautrix_bluesky_docker_image_name_prefix', 'new': 'matrix_mautrix_bluesky_container_image_registry_prefix'} - - {'old': 'matrix_mautrix_bluesky_docker_image', 'new': 'matrix_mautrix_bluesky_container_image'} - - {'old': 'matrix_mautrix_bluesky_docker_image_force_pull', 'new': 'matrix_mautrix_bluesky_container_image_force_pull'} - - {'old': 'matrix_mautrix_bluesky_docker_image_registry_prefix', 'new': 'matrix_mautrix_bluesky_container_image_registry_prefix'} - - {'old': 'matrix_mautrix_bluesky_docker_image_registry_prefix_upstream', 'new': 'matrix_mautrix_bluesky_container_image_registry_prefix_upstream'} - - {'old': 'matrix_mautrix_bluesky_docker_image_registry_prefix_upstream_default', 'new': 'matrix_mautrix_bluesky_container_image_registry_prefix_upstream_default'} - - {'old': 'matrix_mautrix_bluesky_docker_src_files_path', 'new': 'matrix_mautrix_bluesky_container_src_files_path'} - - {'old': 'matrix_mautrix_bluesky_container_image_force_pull', 'new': ' (the new community.docker.docker_image_pull module handles this natively)'} + - {'old': 'matrix_bridge_mautrix_bluesky_docker_image_name_prefix', 'new': 'matrix_bridge_mautrix_bluesky_container_image_registry_prefix'} + - {'old': 'matrix_bridge_mautrix_bluesky_docker_image', 'new': 'matrix_bridge_mautrix_bluesky_container_image'} + - {'old': 'matrix_bridge_mautrix_bluesky_docker_image_force_pull', 'new': 'matrix_bridge_mautrix_bluesky_container_image_force_pull'} + - {'old': 'matrix_bridge_mautrix_bluesky_docker_image_registry_prefix', 'new': 'matrix_bridge_mautrix_bluesky_container_image_registry_prefix'} + - {'old': 'matrix_bridge_mautrix_bluesky_docker_image_registry_prefix_upstream', 'new': 'matrix_bridge_mautrix_bluesky_container_image_registry_prefix_upstream'} + - {'old': 'matrix_bridge_mautrix_bluesky_docker_image_registry_prefix_upstream_default', 'new': 'matrix_bridge_mautrix_bluesky_container_image_registry_prefix_upstream_default'} + - {'old': 'matrix_bridge_mautrix_bluesky_docker_src_files_path', 'new': 'matrix_bridge_mautrix_bluesky_container_src_files_path'} + - {'old': 'matrix_bridge_mautrix_bluesky_container_image_force_pull', 'new': ' (the new community.docker.docker_image_pull module handles this natively)'} - name: Fail if required mautrix-bluesky settings not defined ansible.builtin.fail: @@ -28,10 +28,10 @@ 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_mautrix_bluesky_appservice_token', when: true} - - {'name': 'matrix_mautrix_bluesky_homeserver_address', when: true} - - {'name': 'matrix_mautrix_bluesky_homeserver_token', when: true} - - {'name': 'matrix_mautrix_bluesky_database_hostname', when: "{{ matrix_mautrix_bluesky_database_engine == 'postgres' }}"} - - {'name': 'matrix_mautrix_bluesky_container_network', when: true} - - {'name': 'matrix_mautrix_bluesky_metrics_proxying_hostname', when: "{{ matrix_mautrix_bluesky_metrics_proxying_enabled }}"} - - {'name': 'matrix_mautrix_bluesky_metrics_proxying_path_prefix', when: "{{ matrix_mautrix_bluesky_metrics_proxying_enabled }}"} + - {'name': 'matrix_bridge_mautrix_bluesky_appservice_token', when: true} + - {'name': 'matrix_bridge_mautrix_bluesky_homeserver_address', when: true} + - {'name': 'matrix_bridge_mautrix_bluesky_homeserver_token', when: true} + - {'name': 'matrix_bridge_mautrix_bluesky_database_hostname', when: "{{ matrix_bridge_mautrix_bluesky_database_engine == 'postgres' }}"} + - {'name': 'matrix_bridge_mautrix_bluesky_container_network', when: true} + - {'name': 'matrix_bridge_mautrix_bluesky_metrics_proxying_hostname', when: "{{ matrix_bridge_mautrix_bluesky_metrics_proxying_enabled }}"} + - {'name': 'matrix_bridge_mautrix_bluesky_metrics_proxying_path_prefix', when: "{{ matrix_bridge_mautrix_bluesky_metrics_proxying_enabled }}"} diff --git a/roles/custom/matrix-bridge-mautrix-bluesky/templates/config.yaml.j2 b/roles/custom/matrix-bridge-mautrix-bluesky/templates/config.yaml.j2 index 7fbac01d8..593ea6a4c 100644 --- a/roles/custom/matrix-bridge-mautrix-bluesky/templates/config.yaml.j2 +++ b/roles/custom/matrix-bridge-mautrix-bluesky/templates/config.yaml.j2 @@ -11,7 +11,7 @@ network: # {{ .DisplayName }} is replaced with the display name of the Bluesky user. # {{ .Username }} is replaced with the username of the Bluesky user. # {% endraw %} - displayname_template: {{ matrix_mautrix_bluesky_network_displayname_template | to_json }} + displayname_template: {{ matrix_bridge_mautrix_bluesky_network_displayname_template | to_json }} # Maximum number of conversations to sync on startup conversation_sync_limit: 20 @@ -20,7 +20,7 @@ network: # Config options that affect the central bridge module. bridge: # The prefix for commands. Only required in non-management rooms. - command_prefix: {{ matrix_mautrix_bluesky_bridge_command_prefix | to_json }} + command_prefix: {{ matrix_bridge_mautrix_bluesky_bridge_command_prefix | to_json }} # Should the bridge create a space for each login containing the rooms that account is in? personal_filtering_spaces: true # Whether the bridge should set names and avatars explicitly for DM portals. @@ -121,7 +121,7 @@ bridge: # * - All Matrix users # domain - All users on that homeserver # mxid - Specific user - permissions: {{ matrix_mautrix_bluesky_bridge_permissions | to_json }} + permissions: {{ matrix_bridge_mautrix_bluesky_bridge_permissions | to_json }} # Config for the bridge's database. database: @@ -132,7 +132,7 @@ database: # https://github.com/mattn/go-sqlite3#connection-string # Postgres: Connection string. For example, postgres://user:password@host/database?sslmode=disable # To connect via Unix socket, use something like postgres:///dbname?host=/var/run/postgresql - uri: {{ matrix_mautrix_bluesky_database_uri | to_json }} + uri: {{ matrix_bridge_mautrix_bluesky_database_uri | to_json }} # Maximum number of connections. max_open_conns: 5 max_idle_conns: 1 @@ -146,9 +146,9 @@ homeserver: # The address that this appservice can use to connect to the homeserver. # Local addresses without HTTPS are generally recommended when the bridge is running on the same machine, # but https also works if they run on different machines. - address: {{ matrix_mautrix_bluesky_homeserver_address | to_json }} + address: {{ matrix_bridge_mautrix_bluesky_homeserver_address | to_json }} # The domain of the homeserver (also known as server_name, used for MXIDs, etc). - domain: {{ matrix_mautrix_bluesky_homeserver_domain | to_json }} + domain: {{ matrix_bridge_mautrix_bluesky_homeserver_domain | to_json }} # What software is the homeserver running? # Standard Matrix homeservers like Synapse, Dendrite and Conduit should just use "standard" here. @@ -164,7 +164,7 @@ homeserver: # The bridge will use the appservice as_token to authorize requests. message_send_checkpoint_endpoint: # Does the homeserver support https://github.com/matrix-org/matrix-spec-proposals/pull/2246? - async_media: {{ matrix_mautrix_bluesky_homeserver_async_media | to_json }} + async_media: {{ matrix_bridge_mautrix_bluesky_homeserver_async_media | to_json }} # Should the bridge use a websocket for connecting to the homeserver? # The server side is currently not documented anywhere and is only implemented by mautrix-wsproxy, @@ -180,11 +180,11 @@ appservice: # Like the homeserver address, a local non-https address is recommended when the bridge is on the same machine. # If the bridge is elsewhere, you must secure the connection yourself (e.g. with https or wireguard) # If you want to use https, you need to use a reverse proxy. The bridge does not have TLS support built in. - address: {{ matrix_mautrix_bluesky_appservice_address | to_json }} + address: {{ matrix_bridge_mautrix_bluesky_appservice_address | to_json }} # A public address that external services can use to reach this appservice. # This is only needed for things like public media. A reverse proxy is generally necessary when using this field. # This value doesn't affect the registration file. - public_address: {{ matrix_mautrix_bluesky_appservice_public_address | to_json }} + public_address: {{ matrix_bridge_mautrix_bluesky_appservice_public_address | to_json }} # The hostname and port where this appservice should listen. # For Docker, you generally have to change the hostname to 0.0.0.0. @@ -196,11 +196,11 @@ appservice: # Appservice bot details. bot: # Username of the appservice bot. - username: {{ matrix_mautrix_bluesky_appservice_bot_username | to_json }} + username: {{ matrix_bridge_mautrix_bluesky_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. - displayname: {{ matrix_mautrix_bluesky_appservice_bot_displayname | to_json(ensure_ascii=False) }} - avatar: {{ matrix_mautrix_bluesky_appservice_bot_avatar | to_json }} + displayname: {{ matrix_bridge_mautrix_bluesky_appservice_bot_displayname | to_json(ensure_ascii=False) }} + avatar: {{ matrix_bridge_mautrix_bluesky_appservice_bot_avatar | to_json }} # Whether to receive ephemeral events via appservice transactions. ephemeral_events: true @@ -211,8 +211,8 @@ appservice: async_transactions: false # Authentication tokens for AS <-> HS communication. Autogenerated; do not modify. - as_token: {{ matrix_mautrix_bluesky_appservice_token | to_json }} - hs_token: {{ matrix_mautrix_bluesky_homeserver_token | to_json }} + as_token: {{ matrix_bridge_mautrix_bluesky_appservice_token | to_json }} + hs_token: {{ matrix_bridge_mautrix_bluesky_homeserver_token | to_json }} # Localpart template of MXIDs for remote users. # {% raw %}{{.}}{% endraw %} is replaced with the internal ID of the user. @@ -230,7 +230,7 @@ matrix: sync_direct_chat_list: true # Whether created rooms should have federation enabled. If false, created portal rooms # will never be federated. Changing this option requires recreating rooms. - federate_rooms: {{ matrix_mautrix_bluesky_matrix_federate_rooms | to_json }} + federate_rooms: {{ matrix_bridge_mautrix_bluesky_matrix_federate_rooms | to_json }} # The threshold as bytes after which the bridge should roundtrip uploads via the disk # rather than keeping the whole file in memory. upload_file_threshold: 5242880 @@ -250,7 +250,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: {{ matrix_mautrix_bluesky_provisioning_shared_secret | to_json }} + shared_secret: {{ matrix_bridge_mautrix_bluesky_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. @@ -300,11 +300,11 @@ direct_media: # See https://docs.mau.fi/bridges/general/backfill.html for more details. backfill: # Whether to do backfilling at all. - enabled: {{ matrix_mautrix_bluesky_backfill_enabled | to_json }} + enabled: {{ matrix_bridge_mautrix_bluesky_backfill_enabled | to_json }} # Maximum number of messages to backfill in empty rooms. - max_initial_messages: {{ matrix_mautrix_bluesky_backfill_max_initial_messages | to_json }} + max_initial_messages: {{ matrix_bridge_mautrix_bluesky_backfill_max_initial_messages | to_json }} # Maximum number of missed messages to backfill after bridge restarts. - max_catchup_messages: {{ matrix_mautrix_bluesky_backfill_max_catchup_messages | to_json }} + max_catchup_messages: {{ matrix_bridge_mautrix_bluesky_backfill_max_catchup_messages | to_json }} # If a backfilled chat is older than this number of hours, # mark it as read even if it's unread on the remote network. unread_hours_threshold: 720 @@ -339,35 +339,35 @@ double_puppet: allow_discovery: false # Shared secrets for automatic double puppeting. # See https://docs.mau.fi/bridges/general/double-puppeting.html for instructions. - secrets: {{ matrix_mautrix_bluesky_double_puppet_secrets | to_json }} + secrets: {{ matrix_bridge_mautrix_bluesky_double_puppet_secrets | to_json }} # End-to-bridge encryption support options. # # See https://docs.mau.fi/bridges/general/end-to-bridge-encryption.html for more info. encryption: # Whether to enable encryption at all. If false, the bridge will not function in encrypted rooms. - allow: {{ matrix_mautrix_bluesky_bridge_encryption_allow | to_json }} + allow: {{ matrix_bridge_mautrix_bluesky_bridge_encryption_allow | to_json }} # Whether to force-enable encryption in all bridged rooms. - default: {{ matrix_mautrix_bluesky_bridge_encryption_default | to_json }} + default: {{ matrix_bridge_mautrix_bluesky_bridge_encryption_default | to_json }} # Whether to require all messages to be encrypted and drop any unencrypted messages. - require: {{ matrix_mautrix_bluesky_bridge_encryption_require | to_json }} + require: {{ matrix_bridge_mautrix_bluesky_bridge_encryption_require | to_json }} # Whether to use MSC2409/MSC3202 instead of /sync long polling for receiving encryption-related data. # This option is not yet compatible with standard Matrix servers like Synapse and should not be used. - appservice: {{ matrix_mautrix_bluesky_bridge_encryption_appservice | to_json }} + appservice: {{ matrix_bridge_mautrix_bluesky_bridge_encryption_appservice | to_json }} # Whether to use MSC4190 instead of appservice login to create the bridge bot device. # Requires the homeserver to support MSC4190 and the device masquerading parts of MSC3202. # Only relevant when using end-to-bridge encryption, required when using encryption with next-gen auth (MSC3861). # Changing this option requires updating the appservice registration file. - msc4190: {{ matrix_mautrix_bluesky_msc4190_enabled | to_json }} + msc4190: {{ matrix_bridge_mautrix_bluesky_msc4190_enabled | to_json }} # Whether to enable self-signing for bridges (Only the bridge bot uses this for now) # Requires msc4190 to replace keys on reset - self_sign: {{ matrix_mautrix_bluesky_self_sign_enabled | to_json }} + self_sign: {{ matrix_bridge_mautrix_bluesky_self_sign_enabled | 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_mautrix_bluesky_bridge_encryption_key_sharing_allow | to_json }} + allow_key_sharing: {{ matrix_bridge_mautrix_bluesky_bridge_encryption_key_sharing_allow | to_json }} # Pickle key for encrypting encryption keys in the bridge database. # If set to generate, a random key will be generated. - pickle_key: {{ matrix_mautrix_bluesky_bridge_encryption_pickle_key | to_json }} + pickle_key: {{ matrix_bridge_mautrix_bluesky_bridge_encryption_pickle_key | to_json }} # Options for deleting megolm sessions from the bridge. delete_keys: # Beeper-specific: delete outbound sessions when hungryserv confirms @@ -426,7 +426,7 @@ encryption: # Logging config. See https://github.com/tulir/zeroconfig for details. logging: - min_level: {{ matrix_mautrix_bluesky_logging_level | to_json }} + min_level: {{ matrix_bridge_mautrix_bluesky_logging_level | to_json }} writers: - type: stdout format: pretty-colored diff --git a/roles/custom/matrix-bridge-mautrix-bluesky/templates/labels.j2 b/roles/custom/matrix-bridge-mautrix-bluesky/templates/labels.j2 index d74544ba2..74fcd4991 100644 --- a/roles/custom/matrix-bridge-mautrix-bluesky/templates/labels.j2 +++ b/roles/custom/matrix-bridge-mautrix-bluesky/templates/labels.j2 @@ -4,39 +4,39 @@ SPDX-FileCopyrightText: 2025 MDAD project contributors SPDX-License-Identifier: AGPL-3.0-or-later #} -{% if matrix_mautrix_bluesky_container_labels_traefik_enabled %} +{% if matrix_bridge_mautrix_bluesky_container_labels_traefik_enabled %} traefik.enable=true -{% if matrix_mautrix_bluesky_container_labels_traefik_docker_network %} -traefik.docker.network={{ matrix_mautrix_bluesky_container_labels_traefik_docker_network }} +{% if matrix_bridge_mautrix_bluesky_container_labels_traefik_docker_network %} +traefik.docker.network={{ matrix_bridge_mautrix_bluesky_container_labels_traefik_docker_network }} {% endif %} traefik.http.services.matrix-mautrix-bluesky-metrics.loadbalancer.server.port=8000 -{% if matrix_mautrix_bluesky_container_labels_metrics_enabled %} +{% if matrix_bridge_mautrix_bluesky_container_labels_metrics_enabled %} ############################################################ # # # Metrics # # # ############################################################ -{% if matrix_mautrix_bluesky_container_labels_metrics_middleware_basic_auth_enabled %} -traefik.http.middlewares.matrix-mautrix-bluesky-metrics-basic-auth.basicauth.users={{ matrix_mautrix_bluesky_container_labels_metrics_middleware_basic_auth_users }} +{% if matrix_bridge_mautrix_bluesky_container_labels_metrics_middleware_basic_auth_enabled %} +traefik.http.middlewares.matrix-mautrix-bluesky-metrics-basic-auth.basicauth.users={{ matrix_bridge_mautrix_bluesky_container_labels_metrics_middleware_basic_auth_users }} traefik.http.routers.matrix-mautrix-bluesky-metrics.middlewares=matrix-mautrix-bluesky-metrics-basic-auth {% endif %} -traefik.http.routers.matrix-mautrix-bluesky-metrics.rule={{ matrix_mautrix_bluesky_container_labels_metrics_traefik_rule }} +traefik.http.routers.matrix-mautrix-bluesky-metrics.rule={{ matrix_bridge_mautrix_bluesky_container_labels_metrics_traefik_rule }} -{% if matrix_mautrix_bluesky_container_labels_metrics_traefik_priority | int > 0 %} -traefik.http.routers.matrix-mautrix-bluesky-metrics.priority={{ matrix_mautrix_bluesky_container_labels_metrics_traefik_priority }} +{% if matrix_bridge_mautrix_bluesky_container_labels_metrics_traefik_priority | int > 0 %} +traefik.http.routers.matrix-mautrix-bluesky-metrics.priority={{ matrix_bridge_mautrix_bluesky_container_labels_metrics_traefik_priority }} {% endif %} traefik.http.routers.matrix-mautrix-bluesky-metrics.service=matrix-mautrix-bluesky-metrics -traefik.http.routers.matrix-mautrix-bluesky-metrics.entrypoints={{ matrix_mautrix_bluesky_container_labels_metrics_traefik_entrypoints }} +traefik.http.routers.matrix-mautrix-bluesky-metrics.entrypoints={{ matrix_bridge_mautrix_bluesky_container_labels_metrics_traefik_entrypoints }} -traefik.http.routers.matrix-mautrix-bluesky-metrics.tls={{ matrix_mautrix_bluesky_container_labels_metrics_traefik_tls | to_json }} -{% if matrix_mautrix_bluesky_container_labels_metrics_traefik_tls %} -traefik.http.routers.matrix-mautrix-bluesky-metrics.tls.certResolver={{ matrix_mautrix_bluesky_container_labels_metrics_traefik_tls_certResolver }} +traefik.http.routers.matrix-mautrix-bluesky-metrics.tls={{ matrix_bridge_mautrix_bluesky_container_labels_metrics_traefik_tls | to_json }} +{% if matrix_bridge_mautrix_bluesky_container_labels_metrics_traefik_tls %} +traefik.http.routers.matrix-mautrix-bluesky-metrics.tls.certResolver={{ matrix_bridge_mautrix_bluesky_container_labels_metrics_traefik_tls_certResolver }} {% endif %} ############################################################ @@ -46,7 +46,7 @@ traefik.http.routers.matrix-mautrix-bluesky-metrics.tls.certResolver={{ matrix_m ############################################################ {% endif %} -{% if matrix_mautrix_bluesky_container_labels_exposure_enabled %} +{% if matrix_bridge_mautrix_bluesky_container_labels_exposure_enabled %} ############################################################ # # # Bridge API exposure # @@ -55,21 +55,21 @@ traefik.http.routers.matrix-mautrix-bluesky-metrics.tls.certResolver={{ matrix_m traefik.http.services.matrix-mautrix-bluesky-exposure.loadbalancer.server.port=29340 -traefik.http.middlewares.matrix-mautrix-bluesky-exposure-strip-prefix.stripprefix.prefixes={{ matrix_mautrix_bluesky_exposure_path_prefix }} +traefik.http.middlewares.matrix-mautrix-bluesky-exposure-strip-prefix.stripprefix.prefixes={{ matrix_bridge_mautrix_bluesky_exposure_path_prefix }} traefik.http.routers.matrix-mautrix-bluesky-exposure.middlewares=matrix-mautrix-bluesky-exposure-strip-prefix -traefik.http.routers.matrix-mautrix-bluesky-exposure.rule={{ matrix_mautrix_bluesky_container_labels_exposure_traefik_rule }} +traefik.http.routers.matrix-mautrix-bluesky-exposure.rule={{ matrix_bridge_mautrix_bluesky_container_labels_exposure_traefik_rule }} -{% if matrix_mautrix_bluesky_container_labels_exposure_traefik_priority | int > 0 %} -traefik.http.routers.matrix-mautrix-bluesky-exposure.priority={{ matrix_mautrix_bluesky_container_labels_exposure_traefik_priority }} +{% if matrix_bridge_mautrix_bluesky_container_labels_exposure_traefik_priority | int > 0 %} +traefik.http.routers.matrix-mautrix-bluesky-exposure.priority={{ matrix_bridge_mautrix_bluesky_container_labels_exposure_traefik_priority }} {% endif %} traefik.http.routers.matrix-mautrix-bluesky-exposure.service=matrix-mautrix-bluesky-exposure -traefik.http.routers.matrix-mautrix-bluesky-exposure.entrypoints={{ matrix_mautrix_bluesky_container_labels_exposure_traefik_entrypoints }} +traefik.http.routers.matrix-mautrix-bluesky-exposure.entrypoints={{ matrix_bridge_mautrix_bluesky_container_labels_exposure_traefik_entrypoints }} -traefik.http.routers.matrix-mautrix-bluesky-exposure.tls={{ matrix_mautrix_bluesky_container_labels_exposure_traefik_tls | to_json }} -{% if matrix_mautrix_bluesky_container_labels_exposure_traefik_tls %} -traefik.http.routers.matrix-mautrix-bluesky-exposure.tls.certResolver={{ matrix_mautrix_bluesky_container_labels_exposure_traefik_tls_certResolver }} +traefik.http.routers.matrix-mautrix-bluesky-exposure.tls={{ matrix_bridge_mautrix_bluesky_container_labels_exposure_traefik_tls | to_json }} +{% if matrix_bridge_mautrix_bluesky_container_labels_exposure_traefik_tls %} +traefik.http.routers.matrix-mautrix-bluesky-exposure.tls.certResolver={{ matrix_bridge_mautrix_bluesky_container_labels_exposure_traefik_tls_certResolver }} {% endif %} ############################################################ @@ -82,4 +82,4 @@ traefik.http.routers.matrix-mautrix-bluesky-exposure.tls.certResolver={{ matrix_ {% endif %} -{{ matrix_mautrix_bluesky_container_labels_additional_labels }} +{{ matrix_bridge_mautrix_bluesky_container_labels_additional_labels }} diff --git a/roles/custom/matrix-bridge-mautrix-bluesky/templates/systemd/matrix-mautrix-bluesky.service.j2 b/roles/custom/matrix-bridge-mautrix-bluesky/templates/systemd/matrix-mautrix-bluesky.service.j2 index 22117f643..589d611fc 100644 --- a/roles/custom/matrix-bridge-mautrix-bluesky/templates/systemd/matrix-mautrix-bluesky.service.j2 +++ b/roles/custom/matrix-bridge-mautrix-bluesky/templates/systemd/matrix-mautrix-bluesky.service.j2 @@ -1,11 +1,11 @@ #jinja2: lstrip_blocks: True [Unit] Description=Matrix Mautrix Bluesky bridge -{% for service in matrix_mautrix_bluesky_systemd_required_services_list %} +{% for service in matrix_bridge_mautrix_bluesky_systemd_required_services_list %} Requires={{ service }} After={{ service }} {% endfor %} -{% for service in matrix_mautrix_bluesky_systemd_wanted_services_list %} +{% for service in matrix_bridge_mautrix_bluesky_systemd_wanted_services_list %} Wants={{ service }} {% endfor %} DefaultDependencies=no @@ -22,18 +22,18 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ --log-driver=none \ --user={{ matrix_user_uid }}:{{ matrix_user_gid }} \ --cap-drop=ALL \ - --network={{ matrix_mautrix_bluesky_container_network }} \ - --mount type=bind,src={{ matrix_mautrix_bluesky_config_path }},dst=/config,ro \ - --mount type=bind,src={{ matrix_mautrix_bluesky_data_path }},dst=/data \ - --label-file={{ matrix_mautrix_bluesky_base_path }}/labels \ - {% for arg in matrix_mautrix_bluesky_container_extra_arguments %} + --network={{ matrix_bridge_mautrix_bluesky_container_network }} \ + --mount type=bind,src={{ matrix_bridge_mautrix_bluesky_config_path }},dst=/config,ro \ + --mount type=bind,src={{ matrix_bridge_mautrix_bluesky_data_path }},dst=/data \ + --label-file={{ matrix_bridge_mautrix_bluesky_base_path }}/labels \ + {% for arg in matrix_bridge_mautrix_bluesky_container_extra_arguments %} {{ arg }} \ {% endfor %} - {{ matrix_mautrix_bluesky_container_image }} \ + {{ matrix_bridge_mautrix_bluesky_container_image }} \ /usr/bin/mautrix-bluesky -c /config/config.yaml -r /config/registration.yaml --no-update -{% if matrix_mautrix_bluesky_container_network != 'host' %} -{% for network in matrix_mautrix_bluesky_container_additional_networks %} +{% if matrix_bridge_mautrix_bluesky_container_network != 'host' %} +{% for network in matrix_bridge_mautrix_bluesky_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-mautrix-bluesky {% endfor %} {% endif %}