fix: manually merge upstream

roles/matrix-base/defaults/main.yml

@@ -99,8 +99,8 @@ matrix_host_command_openssl: "/usr/bin/env openssl"
 matrix_host_command_systemctl: "/usr/bin/env systemctl"
 matrix_host_command_sh: "/usr/bin/env sh"
 
-matrix_ntpd_package: "{{ 'systemd-timesyncd' if (ansible_distribution == 'CentOS' and ansible_distribution_major_version > '7') or (ansible_distribution == 'Ubuntu' and ansible_distribution_major_version > '18')  else ( 'systemd' if ansible_os_family == 'Suse' else 'ntp' ) }}"
+matrix_ntpd_package: "{{ 'systemd-timesyncd' if (ansible_os_family == 'RedHat' and ansible_distribution_major_version > '7') or (ansible_distribution == 'Ubuntu' and ansible_distribution_major_version > '18')  else ( 'systemd' if ansible_os_family == 'Suse' else 'ntp' ) }}"
-matrix_ntpd_service: "{{ 'systemd-timesyncd' if (ansible_distribution == 'CentOS' and ansible_distribution_major_version > '7') or (ansible_distribution == 'Ubuntu' and ansible_distribution_major_version > '18') or ansible_distribution == 'Archlinux' or ansible_os_family == 'Suse' else ('ntpd' if ansible_os_family == 'RedHat' else 'ntp') }}"
+matrix_ntpd_service: "{{ 'systemd-timesyncd' if (ansible_os_family == 'RedHat' and ansible_distribution_major_version > '7') or (ansible_distribution == 'Ubuntu' and ansible_distribution_major_version > '18') or ansible_distribution == 'Archlinux' or ansible_os_family == 'Suse' else ('ntpd' if ansible_os_family == 'RedHat' else 'ntp') }}"
 
 matrix_homeserver_url: "https://{{ matrix_server_fqn_matrix }}"
 

roles/matrix-base/tasks/server_base/setup.yml

@@ -1,10 +1,10 @@
 ---
 
-- include_tasks: "{{ role_path }}/tasks/server_base/setup_centos.yml"
+- include_tasks: "{{ role_path }}/tasks/server_base/setup_redhat.yml"
-  when: ansible_distribution == 'CentOS' and ansible_distribution_major_version < '8'
+  when: ansible_os_family == 'RedHat' and ansible_distribution_major_version < '8'
 
-- include_tasks: "{{ role_path }}/tasks/server_base/setup_centos8.yml"
+- include_tasks: "{{ role_path }}/tasks/server_base/setup_redhat8.yml"
-  when: ansible_distribution == 'CentOS' and ansible_distribution_major_version > '7'
+  when: ansible_os_family == 'RedHat' and ansible_distribution_major_version > '7'
 
 - block:
   # ansible_lsb is only available if lsb-release is installed.

roles/matrix-base/tasks/util/ensure_fuse_installed.yml

@@ -1,11 +1,11 @@
 ---
-# This is for both CentOS 7 and 8
+# This is for both RedHat 7 and 8
-- name: Ensure fuse installed (CentOS)
+- name: Ensure fuse installed (RedHat)
   yum:
     name:
       - fuse
     state: latest
-  when: ansible_distribution == 'CentOS'
+  when: ansible_os_family == 'RedHat'
 
 # This is for both Debian and Raspbian
 - name: Ensure fuse installed (Debian/Raspbian)

roles/matrix-base/tasks/util/ensure_openssl_installed.yml

@@ -1,11 +1,11 @@
 ---
-# This is for both CentOS 7 and 8
+# This is for both RedHat 7 and 8
-- name: Ensure openssl installed (CentOS)
+- name: Ensure openssl installed (RedHat)
   yum:
     name:
       - openssl
     state: latest
-  when: ansible_distribution == 'CentOS'
+  when: ansible_os_family == 'RedHat'
 
 # This is for both Debian and Raspbian
 - name: Ensure openssl installed (Debian/Raspbian)

roles/matrix-ma1sd/tasks/setup_install.yml

@@ -62,10 +62,10 @@
         update_cache: true
       when: (ansible_os_family == 'Debian')
 
-    - name: Ensure gradle is installed for self-building (CentOS)
+    - name: Ensure gradle is installed for self-building (RedHat)
       fail:
-        msg: "Installing gradle on CentOS is currently not supported, so self-building ma1sd cannot happen at this time"
+        msg: "Installing gradle on RedHat ({{ ansible_distribution }}) is currently not supported, so self-building ma1sd cannot happen at this time"
-      when: ansible_distribution == 'CentOS'
+      when: ansible_os_family == 'RedHat'
 
     - name: Ensure gradle is installed for self-building (Archlinux)
       pacman:

roles/matrix-synapse/defaults/main.yml

@@ -9,16 +9,8 @@ matrix_synapse_container_image_self_build_repo: "https://github.com/matrix-org/s
 
 matrix_synapse_docker_image: "{{ matrix_synapse_docker_image_name_prefix }}matrixdotorg/synapse:{{ matrix_synapse_docker_image_tag }}"
 matrix_synapse_docker_image_name_prefix: "{{ 'localhost/' if matrix_synapse_container_image_self_build else matrix_container_global_registry_prefix }}"
-# The if statement below may look silly at times (leading to the same version being returned),
+matrix_synapse_version: v1.52.0
-# but ARM-compatible container images are only released 1-7 hours after a release,
+matrix_synapse_docker_image_tag: "{{ matrix_synapse_version }}"
-# so we may often be on different versions for different architectures when new Synapse releases come out.
-#
-# amd64 gets released first.
-# arm32 relies on self-building, so the same version can be built immediately.
-# arm64 users need to wait for a prebuilt image to become available.
-matrix_synapse_version: v1.51.0
-matrix_synapse_version_arm64: v1.51.0
-matrix_synapse_docker_image_tag: "{{ matrix_synapse_version if matrix_architecture in ['arm32', 'amd64'] else matrix_synapse_version_arm64 }}"
 matrix_synapse_docker_image_force_pull: "{{ matrix_synapse_docker_image.endswith(':latest') }}"
 
 matrix_synapse_base_path: "{{ matrix_base_data_path }}/synapse"

roles/matrix-synapse/tasks/validate_config.yml

@@ -48,6 +48,7 @@
     - {'old': 'matrix_synapse_cache_factor', 'new': 'matrix_synapse_caches_global_factor'}
     - {'old': 'matrix_synapse_trusted_third_party_id_servers', 'new': '<deprecated in Synapse v0.99.4 and removed in Synapse v1.19.0>'}
     - {'old': 'matrix_synapse_use_presence', 'new': 'matrix_synapse_presence_enabled'}
+    - {'old': 'matrix_synapse_version_arm64', 'new': '<superseded by matrix_synapse_version - see https://github.com/matrix-org/synapse/pull/11810>'}
 
 - name: (Deprecation) Catch and report renamed settings in matrix_synapse_configuration_extension_yaml
   fail:

roles/matrix-synapse/templates/synapse/homeserver.yaml.j2

@@ -16,11 +16,11 @@
 # documentation on how to configure or create custom modules for Synapse.
 #
 #modules:
-    # - module: my_super_module.MySuperClass
+  #- module: my_super_module.MySuperClass
-    #   config:
+  #  config:
-    #       do_thing: true
+  #    do_thing: true
-    # - module: my_other_super_module.SomeClass
+  #- module: my_other_super_module.SomeClass
-    #   config: {}
+  #  config: {}
 modules: {{ matrix_synapse_modules|to_json }}
 
 
@@ -488,6 +488,20 @@ limit_remote_rooms:
 #
 #allow_per_room_profiles: false
 
+# The largest allowed file size for a user avatar. Defaults to no restriction.
+#
+# Note that user avatar changes will not work if this is set without
+# using Synapse's media repository.
+#
+#max_avatar_size: 10M
+
+# The MIME types allowed for user avatars. Defaults to no restriction.
+#
+# Note that user avatar changes will not work if this is set without
+# using Synapse's media repository.
+#
+#allowed_avatar_mimetypes: ["image/png", "image/jpeg", "image/gif"]
+
 # How long to keep redacted events in unredacted form in the database. After
 # this period redacted events get replaced with their redacted form in the DB.
 #
@@ -1458,6 +1472,16 @@ autocreate_auto_join_rooms: {{ matrix_synapse_autocreate_auto_join_rooms|to_json
 #
 #auto_join_rooms_for_guests: false
 
+# Whether to inhibit errors raised when registering a new account if the user ID
+# already exists. If turned on, that requests to /register/available will always
+# show a user ID as available, and Synapse won't raise an error when starting
+# a registration with a user ID that already exists. However, Synapse will still
+# raise an error if the registration completes and the username conflicts.
+#
+# Defaults to false.
+#
+#inhibit_user_in_use_error: true
+
 
 ## Metrics ###