Rename a bunch of playbook variables for better consistency

roles/matrix-server/tasks/import_sqlite_db.yml

@@ -52,7 +52,7 @@
 - name: Importing SQLite database into Postgres
   docker_container:
     name: matrix-synapse-migrate
-    image: "{{ docker_matrix_image }}"
+    image: "{{ matrix_docker_image_synapse }}"
     detach: no
     cleanup: yes
     entrypoint: /usr/bin/python
@@ -69,4 +69,4 @@
 - name: Ensure scratchpad directory is deleted
   file:
     path: "{{ matrix_scratchpad_dir }}"
-    state: absent
+    state: absent

roles/matrix-server/tasks/setup_coturn.yml

@@ -7,7 +7,7 @@
 
 - name: Ensure Coturn image is pulled
   docker_image:
-    name: "{{ docker_coturn_image }}"
+    name: "{{ matrix_docker_image_coturn }}"
 
 - name: Ensure Coturn configuration path exists
   file:
@@ -39,4 +39,4 @@
     - '3478/tcp' # STUN
     - '3478/udp' # STUN
     - "{{ matrix_coturn_turn_udp_min_port }}-{{ matrix_coturn_turn_udp_max_port }}/udp" # TURN
-  when: ansible_os_family == 'RedHat'
+  when: ansible_os_family == 'RedHat'

roles/matrix-server/tasks/setup_goofys.yml

@@ -4,7 +4,7 @@
 
 - name: Ensure Goofys Docker image is pulled
   docker_image:
-    name: "{{ docker_goofys_image }}"
+    name: "{{ matrix_docker_image_goofys }}"
   when: matrix_s3_media_store_enabled
 
 # This will throw a Permission Denied error if already mounted
@@ -65,6 +65,6 @@
 
 - name: Ensure Goofys Docker image doesn't exist
   docker_image:
-    name: "{{ docker_goofys_image }}"
+    name: "{{ matrix_docker_image_goofys }}"
     state: absent
   when: "not matrix_s3_media_store_enabled"

roles/matrix-server/tasks/setup_nginx_proxy.yml

@@ -36,7 +36,7 @@
 #
 - name: Ensure nginx Docker image is pulled
   docker_image:
-    name: "{{ docker_nginx_image }}"
+    name: "{{ matrix_docker_image_nginx }}"
   when: matrix_nginx_proxy_enabled
 
 - name: Allow access to nginx proxy ports in firewalld
@@ -87,4 +87,4 @@
   file:
     path: "/etc/cron.d/matrix-nginx-proxy-periodic-restarter"
     state: absent
-  when: "not matrix_nginx_proxy_enabled"
+  when: "not matrix_nginx_proxy_enabled"

roles/matrix-server/tasks/setup_postgres.yml

@@ -26,21 +26,21 @@
 
 - name: Determine Postgres version to use (default to latest)
   set_fact:
-    docker_postgres_image_to_use: "{{ docker_postgres_image_latest }}"
+    matrix_docker_image_postgres_to_use: "{{ matrix_docker_image_postgres_latest }}"
 
 - name: Determine Postgres version to use (use 9.x, if detected)
   set_fact:
-    docker_postgres_image_to_use: "{{ docker_postgres_image_v9 }}"
+    matrix_docker_image_postgres_to_use: "{{ matrix_docker_image_postgres_v9 }}"
   when: "pg_version.startswith('9.')"
 
 - debug:
-    msg: "NOTE: Your setup is on an old Postgres version ({{ docker_postgres_image_to_use }}), while {{ docker_postgres_image_latest }} is supported. You can upgrade using --tags=upgrade-postgres"
-  when: "docker_postgres_image_to_use != docker_postgres_image_latest"
+    msg: "NOTE: Your setup is on an old Postgres version ({{ matrix_docker_image_postgres_to_use }}), while {{ matrix_docker_image_postgres_latest }} is supported. You can upgrade using --tags=upgrade-postgres"
+  when: "matrix_docker_image_postgres_to_use != matrix_docker_image_postgres_latest"
 
 # Even if we don't run the internal server, we still need this for running the CLI
 - name: Ensure postgres Docker image is pulled
   docker_image:
-    name: "{{ docker_postgres_image_to_use }}"
+    name: "{{ matrix_docker_image_postgres_to_use }}"
 
 - name: Ensure Postgres environment variables file created
   template:

roles/matrix-server/tasks/setup_riot_web.yml

@@ -15,7 +15,7 @@
 
 - name: Ensure riot-web Docker image is pulled
   docker_image:
-    name: "{{ docker_riot_image }}"
+    name: "{{ matrix_docker_image_riot }}"
   when: matrix_riot_web_enabled
 
 - name: Ensure Matrix riot-web configured
@@ -64,6 +64,6 @@
 
 - name: Ensure riot-web Docker image doesn't exist
   docker_image:
-    name: "{{ docker_riot_image }}"
+    name: "{{ matrix_docker_image_riot }}"
     state: absent
   when: "not matrix_riot_web_enabled"

roles/matrix-server/tasks/setup_s3fs.yml

@@ -23,5 +23,5 @@
 
 - name: Ensure S3fs Docker image doesn't exist
   docker_image:
-    name: "{{ docker_s3fs_image }}"
+    name: "{{ matrix_docker_image_s3fs }}"
     state: absent

roles/matrix-server/tasks/setup_synapse.yml

@@ -39,7 +39,7 @@
 
 - name: Ensure Matrix Docker image is pulled
   docker_image:
-    name: "{{ docker_matrix_image }}"
+    name: "{{ matrix_docker_image_synapse }}"
 
 - name: Check if a Matrix Synapse configuration exists
   stat:
@@ -51,7 +51,7 @@
 - name: Generate initial Matrix config
   docker_container:
     name: matrix-config
-    image: "{{ docker_matrix_image }}"
+    image: "{{ matrix_docker_image_synapse }}"
     detach: no
     cleanup: yes
     command: generate

roles/matrix-server/tasks/upgrade_postgres.yml

@@ -52,16 +52,16 @@
 
 - name: Determine Postgres version to use (default to latest)
   set_fact:
-    docker_postgres_image_to_use: "{{ docker_postgres_image_latest }}"
+    matrix_docker_image_postgres_to_use: "{{ matrix_docker_image_postgres_latest }}"
 
 - name: Determine Postgres version to use (use 9.x, if detected)
   set_fact:
-    docker_postgres_image_to_use: "{{ docker_postgres_image_v9 }}"
+    matrix_docker_image_postgres_to_use: "{{ matrix_docker_image_postgres_v9 }}"
   when: "pg_version.startswith('9.')"
 
 - name: Abort, if already at latest Postgres version
   fail: msg="You are already running the latest Postgres version supported. Nothing to do"
-  when: "docker_postgres_image_to_use == docker_postgres_image_latest"
+  when: "matrix_docker_image_postgres_to_use == matrix_docker_image_postgres_latest"
 
 - name: Ensure matrix-synapse is stopped
   service: name=matrix-synapse state=stopped
@@ -81,7 +81,7 @@
     --link matrix-postgres:postgres \
     --env-file={{ matrix_environment_variables_data_path }}/env-postgres-pgsql-docker \
     -v {{ postgres_dump_dir }}:/out \
-    {{ docker_postgres_image_to_use }} pg_dump -h postgres {{ matrix_postgres_db_name }} -f /out/{{ postgres_dump_name }}
+    {{ matrix_docker_image_postgres_to_use }} pg_dump -h postgres {{ matrix_postgres_db_name }} -f /out/{{ postgres_dump_name }}
 
 - name: Ensure matrix-postgres is stopped
   service: name=matrix-postgres state=stopped
@@ -109,7 +109,7 @@
     --link matrix-postgres:postgres \
     --env-file={{ matrix_environment_variables_data_path }}/env-postgres-pgsql-docker \
     -v {{ postgres_dump_dir }}:/in:ro \
-    {{ docker_postgres_image_latest }} psql -h postgres -f /in/{{ postgres_dump_name }}
+    {{ matrix_docker_image_postgres_latest }} psql -h postgres -f /in/{{ postgres_dump_name }}
 
 - name: Delete Postgres database dump file
   file: