Fix some ansible-lint-reported warnings

This mostly fixes `key-order` warnings around
`block` statements.

roles/matrix-ma1sd/tasks/migrate_mxisd.yml

@@ -42,7 +42,8 @@
 
 # We use shell commands for the migration, because the Ansible copy module cannot
 # recursively copy remote directories (like `/matrix/mxisd/data/sign.key`) in older versions of Ansible.
-- block:
+- when: "ma1sd_migrate_mxisd_data_dir_stat.stat.exists"
+  block:
     - name: Copy mxisd data files to ma1sd folder
       ansible.builtin.command:
         cmd: "cp -ar {{ matrix_base_data_path }}/mxisd/data {{ matrix_ma1sd_base_path }}"
@@ -66,7 +67,6 @@
         cmd: "mv {{ matrix_base_data_path }}/mxisd {{ matrix_base_data_path }}/mxisd.migrated"
       register: matrix_ma1sd_migrate_mxisd_move_directory_result
       changed_when: matrix_ma1sd_migrate_mxisd_move_directory_result.rc == 0
-  when: "ma1sd_migrate_mxisd_data_dir_stat.stat.exists"
 
 - name: Ensure outdated matrix-mxisd.service doesn't exist
   ansible.builtin.file:

roles/matrix-ma1sd/tasks/setup_install.yml

@@ -21,13 +21,15 @@
 - ansible.builtin.set_fact:
     matrix_ma1sd_requires_restart: false
 
-- block:
+- when: "matrix_ma1sd_database_engine == 'postgres'"
+  block:
     - name: Check if an SQLite database already exists
       ansible.builtin.stat:
         path: "{{ matrix_ma1sd_sqlite_database_path_local }}"
       register: matrix_ma1sd_sqlite_database_path_local_stat_result
 
-    - block:
+    - when: "matrix_ma1sd_sqlite_database_path_local_stat_result.stat.exists | bool"
+      block:
         - ansible.builtin.set_fact:
             matrix_postgres_db_migration_request:
               src: "{{ matrix_ma1sd_sqlite_database_path_local }}"
@@ -44,8 +46,6 @@
 
         - ansible.builtin.set_fact:
             matrix_ma1sd_requires_restart: true
-      when: "matrix_ma1sd_sqlite_database_path_local_stat_result.stat.exists | bool"
-  when: "matrix_ma1sd_database_engine == 'postgres'"
 
 - name: Ensure ma1sd image is pulled
   docker_image:
@@ -59,7 +59,8 @@
   delay: "{{ matrix_container_retries_delay }}"
   until: result is not failed
 
-- block:
+- when: "matrix_ma1sd_container_image_self_build | bool"
+  block:
     - name: Ensure gradle is installed for self-building (Debian)
       ansible.builtin.apt:
         name:
@@ -111,7 +112,6 @@
         repository: "{{ matrix_ma1sd_docker_image }}"
         force_tag: true
         source: local
-  when: "matrix_ma1sd_container_image_self_build | bool"
 
 - name: Ensure ma1sd config installed
   ansible.builtin.copy: