Merge 255b1807a2bafff3b27f5b9651f4de29a6b2b236 into 0312ae490defae3c8561a796798453927a71f485

Signed-off-by: Suguru Hirahara <acioustick@noreply.codeberg.org>

.github/renovate.json

@@ -20,5 +20,8 @@
 			],
 			"ignoreUnstable": false
 		}
+	],
+	"ignoreDeps": [
+		"ghcr.io/matrixgpt/matrix-chatgpt-bot"
 	]
 }

README.md

@@ -32,6 +32,8 @@ While the [list of supported services](#-supported-services) and documentation i
 
     - **Full installation guide (for advanced users)**: if you need to import an existing Matrix server's data into the new server or want to learn more while setting up the server, follow this guide by starting with the **[Prerequisites](./docs/prerequisites.md)** documentation page.
 
+If you experience an issue on configuring the playbook, setting up your server, maintaining services on it, etc., please take a look at our [FAQ](./docs/faq.md). If you cannot find an answer to your question, feel free to ask for [help and support](#-support).
+
 ## ✔ Supported services
 
 Using this playbook, you can get the following list of services configured on your server. Basically, this playbook aims to get you up-and-running with all the necessities around Matrix, without you having to do anything else.

docs/configuring-playbook-bridge-beeper-linkedin.md

@@ -17,11 +17,8 @@ There are some additional things you may wish to configure about the bridge befo
 Encryption support is off by default. If you would like to enable encryption, add the following to your `vars.yml` file:
 
 ```yaml
-matrix_beeper_linkedin_configuration_extension_yaml: |
+matrix_beeper_linkedin_bridge_encryption_allow: true
-  bridge:
+matrix_beeper_linkedin_bridge_encryption_default: true
-    encryption:
-      allow: true
-      default: true
 ```
 
 If you would like to be able to administrate the bridge from your account it can be configured like this:

group_vars/matrix_servers

@@ -753,7 +753,7 @@ matrix_appservice_discord_container_additional_networks_auto: |-
   }}
 
 # If the homeserver disables presence, it's likely better (less wasteful) to also disable presence on the bridge side.
-matrix_appservice_discord_bridge_disablePresence: "{{ not matrix_synapse_presence_enabled }}"
+matrix_appservice_discord_bridge_disablePresence: "{{ (not matrix_synapse_presence_enabled) if matrix_homeserver_implementation == 'synapse' else false }}"
 
 matrix_appservice_discord_appservice_token: "{{ '%s' | format(matrix_homeserver_generic_secret_key) | password_hash('sha512', 'discord.as.token', rounds=655555) | to_uuid }}"
 
@@ -914,7 +914,7 @@ matrix_appservice_irc_container_additional_networks_auto: |-
 
 # The IRC bridge docs say that if homeserver presence is disabled, it's better to also disable
 # IRC bridge presence, for performance reasons.
-matrix_appservice_irc_homeserver_enablePresence: "{{ matrix_synapse_presence_enabled }}"
+matrix_appservice_irc_homeserver_enablePresence: "{{ matrix_synapse_presence_enabled if matrix_homeserver_implementation == 'synapse' else true }}"
 
 matrix_appservice_irc_appservice_token: "{{ '%s' | format(matrix_homeserver_generic_secret_key) | password_hash('sha512', 'irc.as.token', rounds=655555) | to_uuid }}"
 
@@ -1011,18 +1011,20 @@ matrix_beeper_linkedin_appservice_token: "{{ '%s' | format(matrix_homeserver_gen
 matrix_beeper_linkedin_homeserver_address: "{{ matrix_addons_homeserver_client_api_url }}"
 matrix_beeper_linkedin_homeserver_token: "{{ '%s' | format(matrix_homeserver_generic_secret_key) | password_hash('sha512', 'linked.hs.token', rounds=655555) | to_uuid }}"
 
-matrix_beeper_linkedin_login_shared_secret: |-
+matrix_beeper_linkedin_bridge_login_shared_secret_map_auto: |-
   {{
-    ("as_token:" + matrix_appservice_double_puppet_registration_as_token)
+    ({
+      matrix_beeper_linkedin_homeserver_domain: ("as_token:" + matrix_appservice_double_puppet_registration_as_token)
+    })
     if matrix_appservice_double_puppet_enabled
     else (
-      matrix_synapse_ext_password_provider_shared_secret_auth_shared_secret if matrix_synapse_ext_password_provider_shared_secret_auth_enabled
+      {matrix_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 ""
+      else {}
     )
   }}
 
-matrix_beeper_linkedin_bridge_presence: "{{ matrix_synapse_presence_enabled if matrix_synapse_enabled else true }}"
+matrix_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: "{{ '%s' | format(matrix_homeserver_generic_secret_key) | password_hash('sha512', 'maulinkedin.db', rounds=655555) | to_uuid }}"
@@ -1253,7 +1255,7 @@ matrix_mautrix_facebook_appservice_public_prefix: "/{{ '%s' | format(matrix_home
 
 matrix_mautrix_facebook_login_shared_secret: "{{ matrix_synapse_ext_password_provider_shared_secret_auth_shared_secret if matrix_synapse_ext_password_provider_shared_secret_auth_enabled else '' }}"
 
-matrix_mautrix_facebook_bridge_presence: "{{ matrix_synapse_presence_enabled if matrix_synapse_enabled else true }}"
+matrix_mautrix_facebook_bridge_presence: "{{ (matrix_synapse_presence_enabled if matrix_synapse_enabled else true) if matrix_homeserver_implementation == 'synapse' else true }}"
 
 matrix_mautrix_facebook_metrics_enabled: "{{ prometheus_enabled or matrix_metrics_exposure_enabled }}"
 
@@ -1465,7 +1467,7 @@ matrix_mautrix_instagram_homeserver_token: "{{ '%s' | format(matrix_homeserver_g
 
 matrix_mautrix_instagram_login_shared_secret: "{{ matrix_synapse_ext_password_provider_shared_secret_auth_shared_secret if matrix_synapse_ext_password_provider_shared_secret_auth_enabled else '' }}"
 
-matrix_mautrix_instagram_bridge_presence: "{{ matrix_synapse_presence_enabled if matrix_synapse_enabled else true }}"
+matrix_mautrix_instagram_bridge_presence: "{{ (matrix_synapse_presence_enabled if matrix_synapse_enabled else true) if matrix_homeserver_implementation == 'synapse' else true }}"
 
 matrix_mautrix_instagram_metrics_enabled: "{{ prometheus_enabled or matrix_metrics_exposure_enabled }}"
 

requirements.yml

@@ -22,7 +22,7 @@
   version: v4.98-r0-2-0
   name: exim_relay
 - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-grafana.git
-  version: v11.3.1-0
+  version: v11.4.0-0
   name: grafana
 - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-jitsi.git
   version: v9823-1
@@ -46,7 +46,7 @@
   version: v17.2-0
   name: postgres
 - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-postgres-backup.git
-  version: v16-0
+  version: v17-0
   name: postgres_backup
 - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-prometheus.git
   version: v2.55.1-0

roles/custom/matrix-bridge-beeper-linkedin/defaults/main.yml

@@ -60,7 +60,8 @@ matrix_beeper_linkedin_appservice_token: ""
 matrix_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
 
 # Database-related configuration fields.
 # Only Postgres is supported.
@@ -87,9 +88,24 @@ matrix_beeper_linkedin_appservice_database_uri: "{{
 	}[matrix_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: {}
 
-# Can be set to enable automatic double-puppeting via Shared Secret Auth (https://github.com/devture/matrix-synapse-shared-secret-auth) or Appservice Double Puppet.
+# Servers to always allow double puppeting from
-matrix_beeper_linkedin_login_shared_secret: ''
+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: |-
+  {{
+    {}
+    | combine({
+      matrix_beeper_linkedin_homeserver_domain: matrix_beeper_linkedin_homeserver_address
+    })
+  }}
+matrix_beeper_linkedin_bridge_double_puppet_server_map_auto: {}
+matrix_beeper_linkedin_bridge_double_puppet_server_map_custom: {}
+
+matrix_beeper_linkedin_provisioning_enabled: false
+matrix_beeper_linkedin_provisioning_shared_secret: ''
 
 # Specifies the default log level for all bridge loggers.
 matrix_beeper_linkedin_logging_level: WARNING
@@ -97,6 +113,8 @@ matrix_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 }}"
 
 # Default beeper-linkedin configuration template which covers the generic use case.

roles/custom/matrix-bridge-beeper-linkedin/tasks/setup_install.yml

@@ -14,8 +14,23 @@
     - {path: "{{ matrix_beeper_linkedin_docker_src_files_path }}", when: "{{ matrix_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"
+    mode: 0644
+    owner: "{{ matrix_user_username }}"
+    group: "{{ matrix_user_groupname }}"
 
-- name: Ensure Beeper LinkedIn image is pulled
+- 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"
+    mode: 0644
+    owner: "{{ matrix_user_username }}"
+    group: "{{ matrix_user_groupname }}"
+
+- name: Ensure Beeper LinkedIn container image is pulled
   community.docker.docker_image:
     name: "{{ matrix_beeper_linkedin_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
@@ -41,7 +56,7 @@
 
     # 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
-    - name: Ensure docker-requirements.txt is generated before building Beeper LinkedIn Docker Image
+    - name: Ensure docker-requirements.txt is generated before building Beeper LinkedIn container image
       ansible.builtin.command:
         cmd: |
           {{ devture_systemd_docker_base_host_command_docker }} run
@@ -54,7 +69,7 @@
       register: matrix_beeper_linkedin_generate_docker_requirements_result
       changed_when: matrix_beeper_linkedin_generate_docker_requirements_result.rc == 0
 
-    - name: Ensure Beeper LinkedIn Docker image is built
+    - name: Ensure Beeper LinkedIn container image is built
       community.docker.docker_image:
         name: "{{ matrix_beeper_linkedin_docker_image }}"
         source: build
@@ -67,22 +82,6 @@
           args:
             TARGETARCH: "{{ matrix_architecture }}"
 
-- 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"
-    mode: 0644
-    owner: "{{ matrix_user_username }}"
-    group: "{{ matrix_user_groupname }}"
-
-- 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"
-    mode: 0644
-    owner: "{{ matrix_user_username }}"
-    group: "{{ matrix_user_groupname }}"
-
 - name: Ensure beeper-linkedin container network is created
   community.general.docker_network:
     enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}"

roles/custom/matrix-bridge-beeper-linkedin/tasks/validate_config.yml

@@ -11,3 +11,12 @@
     - {'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: (Deprecation) Catch and report renamed beeper-linkedin settings
+  ansible.builtin.fail:
+    msg: >-
+      Your configuration contains a variable, which now has a different name.
+      Please change your configuration to rename the variable (`{{ item.old }}` -> `{{ item.new }}`).
+  when: "item.old in vars"
+  with_items:
+    - {'old': 'matrix_beeper_linkedin_login_shared_secret', 'new': '<superseded by matrix_beeper_linkedin_bridge_login_shared_secret_map_*>'}

roles/custom/matrix-bridge-beeper-linkedin/templates/config.yaml.j2

@@ -1,62 +1,74 @@
 #jinja2: lstrip_blocks: "True"
-# Homeserver details.
+# Homeserver details
 homeserver:
     # The address that this appservice can use to connect to the homeserver.
-    address: {{ matrix_beeper_linkedin_homeserver_address }}
+    address: {{ matrix_beeper_linkedin_homeserver_address | to_json }}
     # The domain of the homeserver (for MXIDs, etc).
-    domain: {{ matrix_beeper_linkedin_homeserver_domain }}
+    domain: {{ matrix_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
-    # Whether or not the homeserver supports asmux-specific endpoints,
+    # What software is the homeserver running?
-    # such as /_matrix/client/unstable/net.maunium.asmux/dms for atomically
+    # Standard Matrix homeservers like Synapse, Dendrite and Conduit should just use "standard" here.
-    # updating m.direct.
+    software: standard
-    asmux: false
     # Number of retries for all HTTP requests if the homeserver isn't reachable.
     http_retry_count: 4
+    # The URL to push real-time bridge status to.
+    # If set, the bridge will make POST requests to this URL whenever a user's Signal connection state changes.
+    # The bridge will use the appservice as_token to authorize requests.
+    status_endpoint: null
+    # Endpoint for reporting per-message status.
+    message_send_checkpoint_endpoint: null
+    # Whether asynchronous uploads via MSC2246 should be enabled for media.
+    # Requires a media repo that supports MSC2246.
+    async_media: false
 
-
+# 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 }}
+    address: {{ matrix_beeper_linkedin_appservice_address | to_json }}
 
     # The hostname and port where this appservice should listen.
     hostname: 0.0.0.0
     port: 29319
-
     # The maximum body size of appservice API requests (from the homeserver) in mebibytes
     # Usually 1 is enough, but on high-traffic bridges you might need to increase this to avoid 413s
     max_body_size: 1
 
-    # The full URI to the database. Only Postgres is currently supported.
+    # The full URI to the database. SQLite and Postgres are supported.
-    database: {{ matrix_beeper_linkedin_appservice_database_uri|to_json }}
+    # Format examples:
-    # Additional arguments for asyncpg.create_pool()
+    #   SQLite:   sqlite:filename.db
+    #   Postgres: postgres://username:password@hostname/dbname
+    database: {{ matrix_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
+    # For sqlite, min_size is used as the connection thread pool size and max_size is ignored.
+    # Additionally, SQLite supports init_commands as an array of SQL queries to run on connect (e.g. to set PRAGMAs).
     database_opts:
-        min_size: 5
+        min_size: 1
         max_size: 10
 
     # Provisioning API part of the web server for automated portal creation and fetching information.
     # Used by things like mautrix-manager (https://github.com/tulir/mautrix-manager).
     provisioning:
         # Whether or not the provisioning API should be enabled.
-        enabled: true
+        enabled: {{ matrix_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: generate
+        shared_secret: {{ matrix_beeper_linkedin_provisioning_shared_secret | to_json }}
 
     # The unique ID of this appservice.
     id: beeper_linkedin
-    # Appservice bot details.
+    # Username of the appservice bot.
-    bot:
+    bot_username: {{ matrix_beeper_linkedin_appservice_bot_username | to_json }}
-        # Username of the appservice bot.
+    # Display name and avatar for bot. Set to "remove" to remove display name/avatar, leave empty
-        username: {{ matrix_beeper_linkedin_appservice_bot_username|to_json }}
+    # to leave display name/avatar as-is.
-        # Display name and avatar for bot. Set to "remove" to remove display name/avatar, leave empty
+    bot_displayname: {{ matrix_beeper_linkedin_appservice_bot_displayname | to_json }}
-        # to leave display name/avatar as-is.
+    bot_avatar: {{ matrix_beeper_linkedin_appservice_bot_avatar | to_json }}
-        displayname: LinkedIn bridge bot
-        avatar: mxc://sumnerevans.com/XMtwdeUBnxYvWNFFrfeTSHqB
 
     # Whether or not to receive ephemeral events via appservice transactions.
     # Requires MSC2409 support (i.e. Synapse 1.22+).
@@ -64,9 +76,17 @@ appservice:
     ephemeral_events: false
 
     # Authentication tokens for AS <-> HS communication. Autogenerated; do not modify.
-    as_token: "{{ matrix_beeper_linkedin_appservice_token }}"
+    as_token: {{ matrix_beeper_linkedin_appservice_token | to_json }}
-    hs_token: "{{ matrix_beeper_linkedin_homeserver_token }}"
+    hs_token: {{ matrix_beeper_linkedin_homeserver_token | to_json }}
 
+# Segment-compatible analytics endpoint for tracking some events, like provisioning API login and encryption errors.
+analytics:
+    # Hostname of the tracking server. The path is hardcoded to /v1/track
+    host: api.segment.io
+    # API key to send with tracking requests. Tracking is disabled if this is null.
+    token: null
+    # Optional user ID for tracking events. If null, defaults to using Matrix user ID.
+    user_id: null
 
 # Prometheus telemetry config. Requires prometheus-client to be installed.
 metrics:
@@ -84,30 +104,41 @@ manhole:
     whitelist:
     - 0
 
-
 # Bridge config
 bridge:
     # Localpart template of MXIDs for LinkedIn users.
-    # {userid} is replaced with the user ID of the LinkedIn user
+    # {userid} is replaced with the user ID of the LinkedIn user.
     username_template: "linkedin_{userid}"
     # Settings for creating a space for every user.
     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_beeper_linkedin_bridge_space_support_enable | to_json }}
         # The name of the space
         name: "LinkedIn"
-
     # Displayname template for LinkedIn users.
     # {displayname} is replaced with the display name of the LinkedIn user
     #               as defined below in displayname_preference.
     # Keys available for displayname_preference are also available here.
     displayname_template: "{displayname} (LinkedIn)"
+    # Available keys:
+    # "name" (full name)
+    # "first_name"
+    # "last_name"
+    displayname_preference:
+    - name
+    - first_name
+
+    # Whether or not to set the topic on DMs to the user's occupation and a
+    # link to their profile.
+    set_topic_on_dms: true
+
+    # The prefix for commands. Only required in non-management rooms.
+    command_prefix: {{ matrix_beeper_linkedin_command_prefix | to_json }}
 
     # Number of chats to sync (and create portals for) on startup/login.
     # Set 0 to disable automatic syncing.
-    initial_chat_sync: 10
+    initial_chat_sync: 20
-
     # Whether or not the LinkedIn users of logged in Matrix users should be
     # invited to private chats when the user sends a message from another client.
     invite_own_puppet_to_pm: false
@@ -119,65 +150,112 @@ bridge:
     # and is therefore prone to race conditions.
     sync_direct_chat_list: false
     # Servers to always allow double puppeting from
-    double_puppet_server_map: {}
+    double_puppet_server_map: {{ matrix_beeper_linkedin_bridge_double_puppet_server_map | to_json }}
-    #    example.com: https://example.com
     # Allow using double puppeting from any server with a valid client .well-known file.
-
+    double_puppet_allow_discovery: false
-    # Maximum number of seconds since last message in chat to skip
+    # Shared secrets for https://github.com/devture/matrix-synapse-shared-secret-auth
-    # syncing the chat in any case. This setting will take priority
-    # over both recovery_chat_sync_limit and initial_chat_sync_count.
-    # Default is 3 days = 259200 seconds
-    sync_max_chat_age: 259200
-
-    # Whether or not to sync with custom puppets to receive EDUs that
-    # are not normally sent to appservices.
-    sync_with_custom_puppets: true
-    # Shared secret for https://github.com/devture/matrix-synapse-shared-secret-auth
     #
     # If set, custom puppets will be enabled automatically for local users
     # instead of users having to find an access token and run `login-matrix`
     # manually.
-    login_shared_secret: {{ matrix_beeper_linkedin_login_shared_secret|to_json }}
+    # If using this for other servers than the bridge's server,
-
+    # you must also set the URL in the double_puppet_server_map.
-    # Allow using double puppeting from any server with a valid client .well-known file.
+    login_shared_secret_map: {{ matrix_beeper_linkedin_bridge_login_shared_secret_map | to_json }}
-    double_puppet_allow_discovery: false
-
     # 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_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.
+    # If false, created portal rooms will never be federated.
+    federate_rooms: true
+    # Whether to explicitly set the avatar and room name for private chat portal rooms.
+    # If set to `default`, this will be enabled in encrypted rooms and disabled in unencrypted rooms.
+    # If set to `always`, all DM rooms will have explicit names and avatars set.
+    # If set to `never`, DM rooms will never have names and avatars set.
+    private_chat_portal_meta: default
 
-
+    # End-to-bridge encryption support options.
-    # End-to-bridge encryption support options. These require matrix-nio to be installed with pip
-    # and login_shared_secret to be configured in order to get a device for the bridge bot.
     #
-    # Additionally, https://github.com/matrix-org/synapse/pull/5758 is required if using a normal
+    # See https://docs.mau.fi/bridges/general/end-to-bridge-encryption.html for more info.
-    # application service.
     encryption:
         # Allow encryption, work in group chat rooms with e2ee enabled
-        allow: {{ matrix_beeper_linkedin_bridge_encryption_allow|to_json }}
+        allow: {{ matrix_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_beeper_linkedin_bridge_encryption_default | to_json }}
-        # Options for automatic key sharing.
+        # Whether to use MSC2409/MSC3202 instead of /sync long polling for receiving encryption-related data.
-        key_sharing:
+        appservice: {{ matrix_beeper_linkedin_bridge_encryption_appservice | to_json }}
-            # Enable key sharing? If enabled, key requests for rooms where users are in will be fulfilled.
+        # Require encryption, drop any unencrypted messages.
-            # You must use a client that supports requesting keys from other users to use this feature.
+        require: {{ matrix_beeper_linkedin_bridge_encryption_require | to_json }}
-            allow: {{ matrix_beeper_linkedin_bridge_encryption_key_sharing_allow|to_json }}
+        # Enable key sharing? If enabled, key requests for rooms where users are in will be fulfilled.
-            # Require the requesting device to have a valid cross-signing signature?
+        # You must use a client that supports requesting keys from other users to use this feature.
-            # This doesn't require that the bridge has verified the device, only that the user has verified it.
+        allow_key_sharing: {{ matrix_beeper_linkedin_bridge_encryption_key_sharing_allow | to_json }}
-            # Not yet implemented.
+        # Options for deleting megolm sessions from the bridge.
-            require_cross_signing: false
+        delete_keys:
-            # Require devices to be verified by the bridge?
+            # Beeper-specific: delete outbound sessions when hungryserv confirms
-            # Verification by the bridge is not yet implemented.
+            # that the user has uploaded the key to key backup.
-            require_verification: true
+            delete_outbound_on_ack: false
+            # Don't store outbound sessions in the inbound table.
+            dont_store_outbound: false
+            # Ratchet megolm sessions forward after decrypting messages.
+            ratchet_on_decrypt: false
+            # Delete fully used keys (index >= max_messages) after decrypting messages.
+            delete_fully_used_on_decrypt: false
+            # Delete previous megolm sessions from same device when receiving a new one.
+            delete_prev_on_new_session: false
+            # Delete megolm sessions received from a device when the device is deleted.
+            delete_on_device_delete: false
+            # Periodically delete megolm sessions when 2x max_age has passed since receiving the session.
+            periodically_delete_expired: false
+            # Delete inbound megolm sessions that don't have the received_at field used for
+            # automatic ratcheting and expired session deletion. This is meant as a migration
+            # to delete old keys prior to the bridge update.
+            delete_outdated_inbound: false
+        # What level of device verification should be required from users?
+        #
+        # Valid levels:
+        #   unverified - Send keys to all device in the room.
+        #   cross-signed-untrusted - Require valid cross-signing, but trust all cross-signing keys.
+        #   cross-signed-tofu - Require valid cross-signing, trust cross-signing keys on first use (and reject changes).
+        #   cross-signed-verified - Require valid cross-signing, plus a valid user signature from the bridge bot.
+        #                           Note that creating user signatures from the bridge bot is not currently possible.
+        #   verified - Require manual per-device verification
+        #              (currently only possible by modifying the `trust` column in the `crypto_device` database table).
+        verification_levels:
+            # Minimum level for which the bridge should send keys to when bridging messages from Telegram to Matrix.
+            receive: unverified
+            # Minimum level that the bridge should accept for incoming Matrix messages.
+            send: unverified
+            # Minimum level that the bridge should require for accepting key requests.
+            share: cross-signed-tofu
+        # Options for Megolm room key rotation. These options allow you to
+        # configure the m.room.encryption event content. See:
+        # https://spec.matrix.org/v1.3/client-server-api/#mroomencryption for
+        # more information about that event.
+        rotation:
+            # Enable custom Megolm room key rotation settings. Note that these
+            # settings will only apply to rooms created after this option is
+            # set.
+            enable_custom: false
+            # The maximum number of milliseconds a session should be used
+            # before changing it. The Matrix spec recommends 604800000 (a week)
+            # as the default.
+            milliseconds: 604800000
+            # The maximum number of messages that should be sent with a given a
+            # session before changing it. The Matrix spec recommends 100 as the
+            # default.
+            messages: 100
+
+            # Disable rotating keys when a user's devices change?
+            # You should not enable this option unless you understand all the implications.
+            disable_device_change_key_rotation: false
+
     # Whether or not the bridge should send a read receipt from the bridge bot when a message has
     # been sent to LinkedIn.
     delivery_receipts: false
     # Whether to allow inviting arbitrary mxids to portal rooms
     allow_invites: false
-
     # Settings for backfilling messages from LinkedIn.
     backfill:
         # Whether or not the LinkedIn users of logged in Matrix users should be
@@ -194,6 +272,10 @@ bridge:
         # If using double puppeting, should notifications be disabled
         # while the initial backfill is in progress?
         disable_notifications: false
+        # If this value is greater than 0, then (on backfill) if the
+        # conversation's last message was more than this number of hours ago,
+        # then the conversation will automatically be marked it as read.
+        unread_hours_threshold: 0
     periodic_reconnect:
         # TODO needed?
         # Interval in seconds in which to automatically reconnect all users.
@@ -224,23 +306,20 @@ bridge:
     # Whether or not mute status and tags should only be bridged when the portal room is created.
     tag_only_on_create: true
 
-
-    # The prefix for commands. Only required in non-management rooms.
-    command_prefix: "{{ matrix_beeper_linkedin_command_prefix }}"
-
     # Permissions for using the bridge.
     # Permitted values:
-    #     user - Access to use the bridge to chat with a Linkedin account.
+    #       user - Use the bridge with puppeting.
-    #    admin - User level and some additional administration tools
+    #      admin - Use and administrate the bridge.
     # Permitted keys:
     #        * - All Matrix users
     #   domain - All users on that homeserver
     #     mxid - Specific user
-    permissions: {{ matrix_beeper_linkedin_bridge_permissions|to_json }}
+    permissions: {{ matrix_beeper_linkedin_bridge_permissions | to_json }}
 
-
+# Python logging configuration.
-
+#
-# Logging config.
+# See section 16.7.2 of the Python documentation for more info:
+# https://docs.python.org/3.6/library/logging.config.html#configuration-dictionary-schema
 logging:
     version: 1
     formatters:
@@ -256,10 +335,8 @@ logging:
     loggers:
         mau:
             level: {{ matrix_beeper_linkedin_logging_level|to_json }}
-        paho:
-            level: {{ matrix_beeper_linkedin_logging_level|to_json }}
         aiohttp:
             level: {{ matrix_beeper_linkedin_logging_level|to_json }}
     root:
-        level: {{ matrix_beeper_linkedin_logging_level|to_json }}
+        level: DEBUG
         handlers: [console]

roles/custom/matrix-bridge-beeper-linkedin/templates/systemd/matrix-beeper-linkedin.service.j2

@@ -23,13 +23,13 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
 			--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=/data \
+			--mount type=bind,src={{ matrix_beeper_linkedin_config_path }},dst=/config,ro \
 			--workdir=/opt/linkedin-matrix \
 			{% for arg in matrix_beeper_linkedin_container_extra_arguments %}
 			{{ arg }} \
 			{% endfor %}
 			{{ matrix_beeper_linkedin_docker_image }} \
-			python3 -m linkedin_matrix -c /data/config.yaml -r /data/registration.yaml
+			python3 -m linkedin_matrix -c /config/config.yaml -r /config/registration.yaml --no-update
 
 {% for network in matrix_beeper_linkedin_container_additional_networks %}
 ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-beeper-linkedin

roles/custom/matrix-bridge-hookshot/defaults/main.yml

@@ -30,6 +30,9 @@ matrix_hookshot_docker_src_files_path: "{{ matrix_hookshot_base_path }}/docker-s
 matrix_hookshot_homeserver_address: ""
 matrix_hookshot_container_url: 'matrix-hookshot'
 
+# Sets the localpart of the Matrix ID for the hookshot bot
+matrix_hookshot_bot_localpart: "hookshot"
+
 matrix_hookshot_public_scheme: https
 matrix_hookshot_public_hostname: "{{ matrix_server_fqn_matrix }}"
 matrix_hookshot_public_endpoint: /hookshot

roles/custom/matrix-bridge-hookshot/templates/registration.yml.j2

@@ -25,7 +25,7 @@ namespaces:
     - regex: "#github_.+:{{ matrix_domain }}"
       exclusive: true
 
-sender_localpart: hookshot
+sender_localpart: {{ matrix_hookshot_bot_localpart | to_json }}
 url: "http://{{ matrix_hookshot_container_url }}:{{ matrix_hookshot_appservice_port }}" # This should match the bridge.port in your config file
 rate_limited: false
 

roles/custom/matrix-bridge-mautrix-discord/defaults/main.yml

@@ -104,9 +104,18 @@ matrix_mautrix_discord_bridge_login_shared_secret_map: "{{ matrix_mautrix_discor
 matrix_mautrix_discord_bridge_login_shared_secret_map_auto: {}
 matrix_mautrix_discord_bridge_login_shared_secret_map_custom: {}
 
+
 # Servers to always allow double puppeting from
-matrix_mautrix_discord_bridge_double_puppet_server_map:
+matrix_mautrix_discord_bridge_double_puppet_server_map: "{{ matrix_mautrix_discord_bridge_double_puppet_server_map_default | combine(matrix_mautrix_discord_bridge_double_puppet_server_map_auto) | combine(matrix_mautrix_discord_bridge_double_puppet_server_map_custom) }}"
-  "{{ matrix_mautrix_discord_homeserver_domain :  matrix_mautrix_discord_homeserver_address }}"
+matrix_mautrix_discord_bridge_double_puppet_server_map_default: |-
+  {{
+    {}
+    | combine({
+      matrix_beeper_linkedin_homeserver_domain: matrix_beeper_linkedin_homeserver_address
+    })
+  }}
+matrix_mautrix_discord_bridge_double_puppet_server_map_auto: {}
+matrix_mautrix_discord_bridge_double_puppet_server_map_custom: {}
 
 # Default mautrix-discord configuration template which covers the generic use case.
 # You can customize it by controlling the various variables inside it.

roles/custom/matrix-bridge-mautrix-discord/templates/config.yaml.j2

@@ -173,8 +173,7 @@ bridge:
             height: 320
             fps: 25 # only for webm, webp and gif (2, 5, 10, 20 or 25 recommended)
     # Servers to always allow double puppeting from
-    double_puppet_server_map:
+    double_puppet_server_map: {{ matrix_mautrix_discord_bridge_double_puppet_server_map | to_json }}
-        "{{ matrix_mautrix_discord_homeserver_domain }}": {{ matrix_mautrix_discord_homeserver_address }}
     # 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

roles/custom/matrix-cactus-comments-client/defaults/main.yml

@@ -13,7 +13,7 @@ matrix_cactus_comments_client_public_path: "{{ matrix_cactus_comments_client_bas
 matrix_cactus_comments_client_public_path_file_permissions: "0644"
 
 # renovate: datasource=docker depName=joseluisq/static-web-server
-matrix_cactus_comments_client_version: 2.33.1
+matrix_cactus_comments_client_version: 2.34.0
 
 matrix_cactus_comments_client_container_image: "{{ matrix_container_global_registry_prefix }}joseluisq/static-web-server:{{ matrix_cactus_comments_client_container_image_tag }}"
 matrix_cactus_comments_client_container_image_tag: "{{ 'latest' if matrix_cactus_comments_client_version == 'latest' else (matrix_cactus_comments_client_version + '-alpine') }}"

roles/custom/matrix-client-element/defaults/main.yml

@@ -11,7 +11,7 @@ matrix_client_element_container_image_self_build_repo: "https://github.com/eleme
 matrix_client_element_container_image_self_build_low_memory_system_patch_enabled: "{{ ansible_memtotal_mb < 4096 }}"
 
 # renovate: datasource=docker depName=vectorim/element-web
-matrix_client_element_version: v1.11.86
+matrix_client_element_version: v1.11.87
 
 matrix_client_element_docker_image: "{{ matrix_client_element_docker_image_name_prefix }}vectorim/element-web:{{ matrix_client_element_version }}"
 matrix_client_element_docker_image_name_prefix: "{{ 'localhost/' if matrix_client_element_container_image_self_build else matrix_container_global_registry_prefix }}"

roles/custom/matrix-static-files/defaults/main.yml

@@ -8,7 +8,7 @@ matrix_static_files_enabled: true
 matrix_static_files_identifier: matrix-static-files
 
 # renovate: datasource=docker depName=joseluisq/static-web-server
-matrix_static_files_version: 2.33.1
+matrix_static_files_version: 2.34.0
 
 matrix_static_files_base_path: "{{ matrix_base_data_path }}/{{ 'static-files' if matrix_static_files_identifier == 'matrix-static-files' else matrix_static_files_identifier }}"
 matrix_static_files_config_path: "{{ matrix_static_files_base_path }}/config"

roles/custom/matrix-synapse-admin/defaults/main.yml

@@ -14,7 +14,7 @@ matrix_synapse_admin_container_image_self_build: false
 matrix_synapse_admin_container_image_self_build_repo: "https://github.com/etkecc/synapse-admin.git"
 
 # renovate: datasource=docker depName=ghcr.io/etkecc/synapse-admin
-matrix_synapse_admin_version: v0.10.3-etke32
+matrix_synapse_admin_version: v0.10.3-etke33
 matrix_synapse_admin_docker_image: "{{ matrix_synapse_admin_docker_image_name_prefix }}etkecc/synapse-admin:{{ matrix_synapse_admin_version }}"
 matrix_synapse_admin_docker_image_name_prefix: "{{ 'localhost/' if matrix_synapse_admin_container_image_self_build else 'ghcr.io/' }}"
 matrix_synapse_admin_docker_image_force_pull: "{{ matrix_synapse_admin_docker_image.endswith(':latest') }}"

roles/custom/matrix-synapse/defaults/main.yml

@@ -16,7 +16,7 @@ matrix_synapse_enabled: true
 matrix_synapse_github_org_and_repo: element-hq/synapse
 
 # renovate: datasource=docker depName=ghcr.io/element-hq/synapse
-matrix_synapse_version: v1.120.0
+matrix_synapse_version: v1.120.2
 
 matrix_synapse_username: ''
 matrix_synapse_uid: ''