Merge branch 'master' into postgres-per-default

roles/matrix-postgres/tasks/main.yml

@@ -19,10 +19,12 @@
   tags:
     - import-postgres
 
-- import_tasks: "{{ role_path }}/tasks/import_sqlite_db.yml"
+# The `run_postgres_import_sqlite_db` variable had better be renamed to be consistent,
+# but that's a breaking change which may cause trouble for people.
+- import_tasks: "{{ role_path }}/tasks/import_synapse_sqlite_db.yml"
   when: run_postgres_import_sqlite_db|bool
   tags:
-    - import-sqlite-db
+    - import-synapse-sqlite-db
 
 - import_tasks: "{{ role_path }}/tasks/upgrade_postgres.yml"
   when: run_postgres_upgrade|bool

roles/matrix-synapse/tasks/main.yml

@@ -17,7 +17,7 @@
 - import_tasks: "{{ role_path }}/tasks/import_media_store.yml"
   when: run_synapse_import_media_store|bool
   tags:
-    - import-media-store
+    - import-synapse-media-store
 
 - import_tasks: "{{ role_path }}/tasks/register_user.yml"
   when: run_synapse_register_user|bool