From 05966c8cff5dd9edc15d49d41cae546b83d8a9c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gergely=20Horv=C3=A1th?= <gergely.horvath@sztaki.mta.hu>
Date: Mon, 13 Jan 2020 12:52:28 +0100
Subject: [PATCH 01/59] make sure Raspbian is not handled the same as Debian

---
 roles/matrix-base/tasks/server_base/setup.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/roles/matrix-base/tasks/server_base/setup.yml b/roles/matrix-base/tasks/server_base/setup.yml
index 45feb1527..7cb716a93 100644
--- a/roles/matrix-base/tasks/server_base/setup.yml
+++ b/roles/matrix-base/tasks/server_base/setup.yml
@@ -4,7 +4,10 @@
   when: ansible_distribution == 'CentOS'
 
 - include_tasks: "{{ role_path }}/tasks/server_base/setup_debian.yml"
-  when: ansible_os_family == 'Debian'
+     when: (ansible_os_family == 'Debian') and (ansible_lsb.id != 'Raspbian') 
+
+- include_tasks: "{{ role_path }}/tasks/server_base/setup_raspbian.yml"
+     when: (ansible_os_family == 'Debian') and (ansible_lsb.id == 'Raspbian') 
 
 - name: Ensure Docker is started and autoruns
   service:

From 1c314fcf29c0b20739a14dcf633229e72ec415bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gergely=20Horv=C3=A1th?= <gergely.horvath@sztaki.mta.hu>
Date: Mon, 13 Jan 2020 13:38:21 +0100
Subject: [PATCH 02/59] first version of raspbian docker setup

---
 .../tasks/server_base/setup_raspbian.yml      | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 roles/matrix-base/tasks/server_base/setup_raspbian.yml

diff --git a/roles/matrix-base/tasks/server_base/setup_raspbian.yml b/roles/matrix-base/tasks/server_base/setup_raspbian.yml
new file mode 100644
index 000000000..e92842843
--- /dev/null
+++ b/roles/matrix-base/tasks/server_base/setup_raspbian.yml
@@ -0,0 +1,42 @@
+---
+
+- name: Ensure APT usage dependencies are installed
+  apt:
+    name:
+      - apt-transport-https
+      - ca-certificates
+    state: present
+    update_cache: yes
+
+- name: Ensure Docker's APT key is trusted
+  apt_key:
+    url: https://download.docker.com/linux/raspbian/gpg
+    id: 9DC858229FC7DD38854AE2D88D81803C0EBFCD88
+    state: present
+  register: add_repository_key
+  ignore_errors: true
+  when: matrix_docker_installation_enabled|bool and matrix_docker_package_name == 'docker-ce'
+
+- name: Ensure Docker repository is enabled
+  apt_repository:
+    repo: "deb [arch=armhf] https://download.docker.com/linux/raspbian {{ ansible_distribution_release }} stable"
+    state: present
+    update_cache: yes
+  when: matrix_docker_installation_enabled|bool and matrix_docker_package_name == 'docker-ce'
+
+- name: Ensure APT packages are installed
+  apt:
+    name:
+      - bash-completion
+      - python-docker
+      - ntp
+      - fuse
+    state: latest
+    update_cache: yes
+
+- name: Ensure Docker is installed
+  apt:
+    name:
+      - "{{ matrix_docker_package_name }}"
+    state: latest
+  when: matrix_docker_installation_enabled|bool

From 96557c62804f8974bf9b3b86da74ca59d7c3883f Mon Sep 17 00:00:00 2001
From: Dan Arnfield <dan@arnfield.com>
Date: Mon, 17 Feb 2020 13:27:05 -0600
Subject: [PATCH 03/59] Update synapse (1.10.0 -> 1.10.1)

---
 roles/matrix-synapse/defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/matrix-synapse/defaults/main.yml b/roles/matrix-synapse/defaults/main.yml
index 649fc7482..2d6905d43 100644
--- a/roles/matrix-synapse/defaults/main.yml
+++ b/roles/matrix-synapse/defaults/main.yml
@@ -3,7 +3,7 @@
 
 matrix_synapse_enabled: true
 
-matrix_synapse_docker_image: "matrixdotorg/synapse:v1.10.0"
+matrix_synapse_docker_image: "matrixdotorg/synapse:v1.10.1"
 matrix_synapse_docker_image_force_pull: "{{ matrix_synapse_docker_image.endswith(':latest') }}"
 
 matrix_synapse_base_path: "{{ matrix_base_data_path }}/synapse"

From a096eafb45c3aba23573ef3d8689d634c59da876 Mon Sep 17 00:00:00 2001
From: Horvath Gergely <horvathg@hekate>
Date: Mon, 17 Feb 2020 21:48:48 +0100
Subject: [PATCH 04/59] add possibility to install synapse on raspberry pi

---
 group_vars/matrix_servers                     | 16 ++++++++++++++++
 roles/matrix-base/defaults/main.yml           |  2 ++
 roles/matrix-base/tasks/sanity_check.yml      |  7 +++++++
 roles/matrix-base/tasks/server_base/setup.yml |  4 ++--
 roles/matrix-base/tasks/setup_matrix_base.yml |  2 ++
 .../tasks/synapse/setup_install.yml           | 19 +++++++++++++++++++
 6 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers
index 1c7ac23fd..148382fa7 100755
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@@ -678,3 +678,19 @@ matrix_synapse_systemd_wanted_services_list: |
 # /matrix-synapse
 #
 ######################################################################
+
+
+
+######################################################################
+#
+# raspberry pi
+#
+######################################################################
+
+matrix_raspberry_pi: "false"
+
+######################################################################
+#
+# /raspberry pi
+#
+######################################################################
diff --git a/roles/matrix-base/defaults/main.yml b/roles/matrix-base/defaults/main.yml
index b4fef1dd7..b5897d0d1 100644
--- a/roles/matrix-base/defaults/main.yml
+++ b/roles/matrix-base/defaults/main.yml
@@ -26,6 +26,8 @@ matrix_base_data_path: "/matrix"
 matrix_base_data_path_mode: "750"
 
 matrix_static_files_base_path: "{{ matrix_base_data_path }}/static-files"
+matrix_docker_src_files_path: "{{ matrix_base_data_path }}/docker-src"
+matrix_docker_synapse_src_files_path: "{{ matrix_docker_src_files_path }}/synapse"
 
 matrix_homeserver_url: "https://{{ matrix_server_fqn_matrix }}"
 
diff --git a/roles/matrix-base/tasks/sanity_check.yml b/roles/matrix-base/tasks/sanity_check.yml
index b2d8c249e..a0a92a227 100644
--- a/roles/matrix-base/tasks/sanity_check.yml
+++ b/roles/matrix-base/tasks/sanity_check.yml
@@ -44,3 +44,10 @@
     - "{{ matrix_server_fqn_matrix }}"
     - "{{ matrix_server_fqn_riot }}"
   when: "item != item|lower"
+
+# ansible lower than 2.8, does not support docker_image build parameters
+# for Raspberry pi it is explicitly needed, so we rather fail here
+- name: Fail if running on Ansible lower than 2.8 and targeting Raspberry pi
+  fail:
+    msg: "To target Raspberry pi, you should usa ansible 2.8 or higher. E.g. pip contains such packages."
+  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_raspberry_pi"
diff --git a/roles/matrix-base/tasks/server_base/setup.yml b/roles/matrix-base/tasks/server_base/setup.yml
index 7cb716a93..bd52a0e74 100644
--- a/roles/matrix-base/tasks/server_base/setup.yml
+++ b/roles/matrix-base/tasks/server_base/setup.yml
@@ -4,10 +4,10 @@
   when: ansible_distribution == 'CentOS'
 
 - include_tasks: "{{ role_path }}/tasks/server_base/setup_debian.yml"
-     when: (ansible_os_family == 'Debian') and (ansible_lsb.id != 'Raspbian') 
+  when: (ansible_os_family == 'Debian') and (ansible_lsb.id != 'Raspbian') 
 
 - include_tasks: "{{ role_path }}/tasks/server_base/setup_raspbian.yml"
-     when: (ansible_os_family == 'Debian') and (ansible_lsb.id == 'Raspbian') 
+  when: "matrix_raspberry_pi" 
 
 - name: Ensure Docker is started and autoruns
   service:
diff --git a/roles/matrix-base/tasks/setup_matrix_base.yml b/roles/matrix-base/tasks/setup_matrix_base.yml
index b4aa92b9a..952a37a5d 100644
--- a/roles/matrix-base/tasks/setup_matrix_base.yml
+++ b/roles/matrix-base/tasks/setup_matrix_base.yml
@@ -22,6 +22,8 @@
     group: "{{ matrix_user_username }}"
   with_items:
     - "{{ matrix_base_data_path }}"
+    - "{{ matrix_docker_src_files_path }}"
+    - "{{ matrix_docker_synapse_src_files_path }}"
 
 # `docker_network` doesn't work as expected when the given network
 # is a substring of a network that already exists.
diff --git a/roles/matrix-synapse/tasks/synapse/setup_install.yml b/roles/matrix-synapse/tasks/synapse/setup_install.yml
index 88fb0049c..33f04a288 100644
--- a/roles/matrix-synapse/tasks/synapse/setup_install.yml
+++ b/roles/matrix-synapse/tasks/synapse/setup_install.yml
@@ -18,12 +18,31 @@
     group: "{{ matrix_user_username }}"
   when: "not local_path_media_store_stat.failed and not local_path_media_store_stat.stat.exists"
 
+- name: Ensure Synapse repository is present on Raspberry pi
+  git:
+    repo: https://github.com/matrix-org/synapse.git
+    dest: "{{ matrix_docker_synapse_src_files_path }}"
+    version: "{{ matrix_synapse_docker_image.split(':')[1] }}"
+    force: "yes"
+  when: "matrix_raspberry_pi"
+
+- name: Ensure Synapse Docker image is build (Raspberry pi)
+  docker_image:
+    name: "{{ matrix_synapse_docker_image }}"
+    source: build
+    build:
+      dockerfile: docker/Dockerfile
+      path: "{{ matrix_docker_synapse_src_files_path }}"
+      pull: yes
+  when: "matrix_raspberry_pi"
+
 - name: Ensure Synapse Docker image is pulled
   docker_image:
     name: "{{ matrix_synapse_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_synapse_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
     force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_synapse_docker_image_force_pull }}"
+  when: "not matrix_raspberry_pi"
 
 - name: Check if a Synapse signing key exists
   stat:

From 45e32bdad2ec862adbba0ce9b1a93147c8717088 Mon Sep 17 00:00:00 2001
From: orange <flo@sonnenstreifen.de>
Date: Tue, 18 Feb 2020 18:02:24 +0100
Subject: [PATCH 05/59] add synapse config enable_group_creation

---
 roles/matrix-synapse/defaults/main.yml                    | 3 +++
 roles/matrix-synapse/templates/synapse/homeserver.yaml.j2 | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/roles/matrix-synapse/defaults/main.yml b/roles/matrix-synapse/defaults/main.yml
index 2d6905d43..df0b1889a 100644
--- a/roles/matrix-synapse/defaults/main.yml
+++ b/roles/matrix-synapse/defaults/main.yml
@@ -155,6 +155,9 @@ matrix_synapse_allow_public_rooms_over_federation: false
 # Controls whether people with access to the homeserver can register by themselves.
 matrix_synapse_enable_registration: false
 
+# Allows non-server-admin users to create groups on this server
+matrix_synapse_enable_group_creation: false
+
 # A list of 3PID types which users must supply when registering (possible values: email, msisdn).
 matrix_synapse_registrations_require_3pid: []
 
diff --git a/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2 b/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2
index 0b3e96a98..9855d1586 100644
--- a/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2
+++ b/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2
@@ -1582,7 +1582,7 @@ spam_checker: {{ matrix_synapse_spam_checker|to_json }}
 
 # Uncomment to allow non-server-admin users to create groups on this server
 #
-#enable_group_creation: true
+enable_group_creation: {{ matrix_synapse_enable_group_creation }}
 
 # If enabled, non server admins can only create groups with local parts
 # starting with this prefix

From ff59901bc0cc457d75e7ffe0a9bd4171c3fc713b Mon Sep 17 00:00:00 2001
From: Sathis <sathiscode@users.noreply.github.com>
Date: Wed, 19 Feb 2020 13:03:06 +0530
Subject: [PATCH 06/59] Fixed appservice webhooks container port mapping

---
 .../templates/systemd/matrix-appservice-webhooks.service.j2     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/matrix-bridge-appservice-webhooks/templates/systemd/matrix-appservice-webhooks.service.j2 b/roles/matrix-bridge-appservice-webhooks/templates/systemd/matrix-appservice-webhooks.service.j2
index cde798df2..f83e73465 100644
--- a/roles/matrix-bridge-appservice-webhooks/templates/systemd/matrix-appservice-webhooks.service.j2
+++ b/roles/matrix-bridge-appservice-webhooks/templates/systemd/matrix-appservice-webhooks.service.j2
@@ -23,7 +23,7 @@ ExecStart=/usr/bin/docker run --rm --name matrix-appservice-webhooks \
 			--cap-drop=ALL \
 			--network={{ matrix_docker_network }} \
 			{% if matrix_appservice_webhooks_container_http_host_bind_port %}
-			-p {{ matrix_appservice_webhooks_container_http_host_bind_port }}:{{matrix_appservice_webhooks_matrix_port}} \
+			-p {{ matrix_appservice_webhooks_container_http_host_bind_port }}:{{matrix_appservice_webhooks_webhooks_port}} \
 			{% endif %}
 			-v {{ matrix_appservice_webhooks_config_path }}:/config:z \
 			-v {{ matrix_appservice_webhooks_data_path }}:/data:z \

From 8343ff5268d152627d69564608cbb0ba7464c221 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Wed, 19 Feb 2020 10:13:36 +0200
Subject: [PATCH 07/59] Add missing to_json filter

---
 roles/matrix-synapse/templates/synapse/homeserver.yaml.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2 b/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2
index 9855d1586..803eb222e 100644
--- a/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2
+++ b/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2
@@ -1582,7 +1582,7 @@ spam_checker: {{ matrix_synapse_spam_checker|to_json }}
 
 # Uncomment to allow non-server-admin users to create groups on this server
 #
-enable_group_creation: {{ matrix_synapse_enable_group_creation }}
+enable_group_creation: {{ matrix_synapse_enable_group_creation|to_json }}
 
 # If enabled, non server admins can only create groups with local parts
 # starting with this prefix

From 7c4a86bc6b835eb7e30787f7fc4bef1853510b7d Mon Sep 17 00:00:00 2001
From: Horvath Gergely <horvathg@hekate>
Date: Wed, 19 Feb 2020 22:18:17 +0100
Subject: [PATCH 08/59] add coturn support for raspberry pi

---
 roles/matrix-base/defaults/main.yml           |  1 +
 roles/matrix-base/tasks/setup_matrix_base.yml |  5 +++--
 roles/matrix-coturn/tasks/setup_coturn.yml    | 20 ++++++++++++++++++-
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/roles/matrix-base/defaults/main.yml b/roles/matrix-base/defaults/main.yml
index b5897d0d1..6dd986e3a 100644
--- a/roles/matrix-base/defaults/main.yml
+++ b/roles/matrix-base/defaults/main.yml
@@ -28,6 +28,7 @@ matrix_base_data_path_mode: "750"
 matrix_static_files_base_path: "{{ matrix_base_data_path }}/static-files"
 matrix_docker_src_files_path: "{{ matrix_base_data_path }}/docker-src"
 matrix_docker_synapse_src_files_path: "{{ matrix_docker_src_files_path }}/synapse"
+matrix_docker_coturn_src_files_path: "{{ matrix_docker_src_files_path }}/coturn"
 
 matrix_homeserver_url: "https://{{ matrix_server_fqn_matrix }}"
 
diff --git a/roles/matrix-base/tasks/setup_matrix_base.yml b/roles/matrix-base/tasks/setup_matrix_base.yml
index 952a37a5d..fcf0300e8 100644
--- a/roles/matrix-base/tasks/setup_matrix_base.yml
+++ b/roles/matrix-base/tasks/setup_matrix_base.yml
@@ -22,8 +22,9 @@
     group: "{{ matrix_user_username }}"
   with_items:
     - "{{ matrix_base_data_path }}"
-    - "{{ matrix_docker_src_files_path }}"
-    - "{{ matrix_docker_synapse_src_files_path }}"
+    - { src: "{{ matrix_docker_src_files_path }}", when: "{{ matrix_raspberry_pi }}" }
+    - { src: "{{ matrix_docker_synapse_src_files_path }}", when: "{{ matrix_raspberry_pi }}" }
+    - { src: "{{ matrix_docker_coturn_src_files_path }}", when: "{{ matrix_coturn_enabled }}"}
 
 # `docker_network` doesn't work as expected when the given network
 # is a substring of a network that already exists.
diff --git a/roles/matrix-coturn/tasks/setup_coturn.yml b/roles/matrix-coturn/tasks/setup_coturn.yml
index eaa29aa58..9cbf6f033 100644
--- a/roles/matrix-coturn/tasks/setup_coturn.yml
+++ b/roles/matrix-coturn/tasks/setup_coturn.yml
@@ -10,7 +10,25 @@
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_coturn_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
     force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_coturn_docker_image_force_pull }}"
-  when: matrix_coturn_enabled|bool
+  when: matrix_coturn_enabled|bool and not matrix_raspberry_pi
+
+- name: Ensure Coturn repository is present on Raspberry pi
+  git:
+    repo: https://github.com/instrumentisto/coturn-docker-image.git
+    dest: "{{ matrix_docker_coturn_src_files_path }}"
+    version: "{{ matrix_coturn_docker_image.split(':')[1] }}"
+    force: "yes"
+  when: "matrix_raspberry_pi"
+
+- name: Ensure Coturn Docker image is build (Raspberry pi)
+  docker_image:
+    name: "{{ matrix_coturn_docker_image }}"
+    source: build
+    build:
+      dockerfile: Dockerfile
+      path: "{{ matrix_docker_coturn_src_files_path }}"
+      pull: yes
+  when: "matrix_raspberry_pi"
 
 - name: Ensure Coturn configuration path exists
   file:

From 697f86d06f834fbdc828bba32f727f002c5d75f8 Mon Sep 17 00:00:00 2001
From: Horvath Gergely <horvathg@hekate>
Date: Wed, 19 Feb 2020 22:26:43 +0100
Subject: [PATCH 09/59] minor fix

---
 roles/matrix-coturn/tasks/setup_coturn.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/roles/matrix-coturn/tasks/setup_coturn.yml b/roles/matrix-coturn/tasks/setup_coturn.yml
index 9cbf6f033..bdd7d774f 100644
--- a/roles/matrix-coturn/tasks/setup_coturn.yml
+++ b/roles/matrix-coturn/tasks/setup_coturn.yml
@@ -18,7 +18,7 @@
     dest: "{{ matrix_docker_coturn_src_files_path }}"
     version: "{{ matrix_coturn_docker_image.split(':')[1] }}"
     force: "yes"
-  when: "matrix_raspberry_pi"
+  when: "matrix_coturn_enabled|bool and matrix_raspberry_pi"
 
 - name: Ensure Coturn Docker image is build (Raspberry pi)
   docker_image:
@@ -28,7 +28,7 @@
       dockerfile: Dockerfile
       path: "{{ matrix_docker_coturn_src_files_path }}"
       pull: yes
-  when: "matrix_raspberry_pi"
+  when: "matrix_coturn_enabled|bool and matrix_raspberry_pi"
 
 - name: Ensure Coturn configuration path exists
   file:

From 4356a7d405e4120fb83be8870ae2ca6e48cc4af0 Mon Sep 17 00:00:00 2001
From: Sathis <sathiscode@users.noreply.github.com>
Date: Thu, 20 Feb 2020 10:41:19 +0530
Subject: [PATCH 10/59] Configuring webhooks

Added steps to configure appservice webhooks in the dimension manager.
---
 docs/configuring-playbook-bridge-appservice-webhooks.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/configuring-playbook-bridge-appservice-webhooks.md b/docs/configuring-playbook-bridge-appservice-webhooks.md
index 4e56d8e40..32bd26ac9 100644
--- a/docs/configuring-playbook-bridge-appservice-webhooks.md
+++ b/docs/configuring-playbook-bridge-appservice-webhooks.md
@@ -26,6 +26,8 @@ matrix_appservice_webhooks_log_level: '<log_level>'
 
 3. If you've already installed Matrix services using the playbook before, you'll need to re-run it (`--tags=setup-all,start`). If not, proceed with [configuring other playbook services](configuring-playbook.md) and then with [Installing](installing.md). Get back to this guide once ready.
 
+4. Configure Webhooks bridge by opening the Dimension integration manager -> Settings -> Bridges and select edit action for "Webhook Bridge". Press "Add self-hosted Bridge" button and populate "Provisioning URL"  & "Shared Secret" values from appservice-webhooks/config/config.yaml file's homeserver URL value and provisioning secret value respectively. 
+
 4. Invite the bridge bot user to your room:
 
     - either with `/invite @_webhook:<domain.name>` (*Note*: Make sure you have administration permissions in your room)

From dd99b844a0a02d58de8c99bcc91b6a2a6f5d8b62 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Thu, 20 Feb 2020 09:39:27 +0200
Subject: [PATCH 11/59] Link to Dimension setup page

---
 docs/configuring-playbook-bridge-appservice-webhooks.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/configuring-playbook-bridge-appservice-webhooks.md b/docs/configuring-playbook-bridge-appservice-webhooks.md
index 32bd26ac9..0e3553597 100644
--- a/docs/configuring-playbook-bridge-appservice-webhooks.md
+++ b/docs/configuring-playbook-bridge-appservice-webhooks.md
@@ -26,7 +26,7 @@ matrix_appservice_webhooks_log_level: '<log_level>'
 
 3. If you've already installed Matrix services using the playbook before, you'll need to re-run it (`--tags=setup-all,start`). If not, proceed with [configuring other playbook services](configuring-playbook.md) and then with [Installing](installing.md). Get back to this guide once ready.
 
-4. Configure Webhooks bridge by opening the Dimension integration manager -> Settings -> Bridges and select edit action for "Webhook Bridge". Press "Add self-hosted Bridge" button and populate "Provisioning URL"  & "Shared Secret" values from appservice-webhooks/config/config.yaml file's homeserver URL value and provisioning secret value respectively. 
+4. If you're using the [Dimension Integration Manager](configuring-playbook-dimension.md), you can configure the Webhooks bridge by opening the Dimension integration manager -> Settings -> Bridges and selecting edit action for "Webhook Bridge". Press "Add self-hosted Bridge" button and populate "Provisioning URL"  & "Shared Secret" values from `/matrix/appservice-webhooks/config/config.yaml` file's homeserver URL value and provisioning secret value, respectively. 
 
 4. Invite the bridge bot user to your room:
 

From 8c1e00a6cd446f40d589b4ecc75a697330e0d11b Mon Sep 17 00:00:00 2001
From: Horvath Gergely <horvathg@hekate>
Date: Fri, 21 Feb 2020 07:56:28 +0100
Subject: [PATCH 12/59] add mautrix-facebook support for raspberry pi

---
 roles/matrix-base/defaults/main.yml           |  1 +
 roles/matrix-base/tasks/setup_matrix_base.yml |  1 +
 .../tasks/setup_install.yml                   | 19 +++++++++++++++++++
 3 files changed, 21 insertions(+)

diff --git a/roles/matrix-base/defaults/main.yml b/roles/matrix-base/defaults/main.yml
index 6dd986e3a..84199623a 100644
--- a/roles/matrix-base/defaults/main.yml
+++ b/roles/matrix-base/defaults/main.yml
@@ -29,6 +29,7 @@ matrix_static_files_base_path: "{{ matrix_base_data_path }}/static-files"
 matrix_docker_src_files_path: "{{ matrix_base_data_path }}/docker-src"
 matrix_docker_synapse_src_files_path: "{{ matrix_docker_src_files_path }}/synapse"
 matrix_docker_coturn_src_files_path: "{{ matrix_docker_src_files_path }}/coturn"
+matrix_docker_mautrix_facebook_src_files_path: "{{ matrix_docker_src_files_path }}/mautrix-facebook"
 
 matrix_homeserver_url: "https://{{ matrix_server_fqn_matrix }}"
 
diff --git a/roles/matrix-base/tasks/setup_matrix_base.yml b/roles/matrix-base/tasks/setup_matrix_base.yml
index fcf0300e8..aa4177eb6 100644
--- a/roles/matrix-base/tasks/setup_matrix_base.yml
+++ b/roles/matrix-base/tasks/setup_matrix_base.yml
@@ -25,6 +25,7 @@
     - { src: "{{ matrix_docker_src_files_path }}", when: "{{ matrix_raspberry_pi }}" }
     - { src: "{{ matrix_docker_synapse_src_files_path }}", when: "{{ matrix_raspberry_pi }}" }
     - { src: "{{ matrix_docker_coturn_src_files_path }}", when: "{{ matrix_coturn_enabled }}"}
+    - { src: "{{ matrix_docker_mautrix_facebook_src_files_path }}", when: "{{ matrix_mautrix_facebook_enabled }}"}
 
 # `docker_network` doesn't work as expected when the given network
 # is a substring of a network that already exists.
diff --git a/roles/matrix-bridge-mautrix-facebook/tasks/setup_install.yml b/roles/matrix-bridge-mautrix-facebook/tasks/setup_install.yml
index 68c823c6c..a8c7cdf1a 100644
--- a/roles/matrix-bridge-mautrix-facebook/tasks/setup_install.yml
+++ b/roles/matrix-bridge-mautrix-facebook/tasks/setup_install.yml
@@ -14,6 +14,25 @@
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_mautrix_facebook_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
     force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_mautrix_facebook_docker_image_force_pull }}"
+  when: matrix_mautrix_facebook_enabled|bool and not matrix_raspberry_pi
+
+- name: Ensure Mautrix Facebook repository is present on Raspberry pi
+  git:
+    repo: https://github.com/tulir/mautrix-facebook.git
+    dest: "{{ matrix_docker_mautrix_facebook_src_files_path }}"
+#    version: "{{ matrix_coturn_docker_image.split(':')[1] }}"
+    force: "yes"
+  when: "matrix_mautrix_facebook_enabled|bool and matrix_raspberry_pi"
+
+- name: Ensure Mautrix Facebook Docker image is build (Raspberry pi)
+  docker_image:
+    name: "{{ matrix_mautrix_facebook_docker_image }}"
+    source: build
+    build:
+      dockerfile: Dockerfile
+      path: "{{ matrix_docker_mautrix_facebook_src_files_path }}"
+      pull: yes
+  when: "matrix_mautrix_facebook_enabled|bool and matrix_raspberry_pi"
 
 - name: Ensure Mautrix Facebook paths exist
   file:

From 5de8f27122ac1ad826de5bab93eb0d02380135de Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Fri, 21 Feb 2020 12:31:40 +0200
Subject: [PATCH 13/59] Upgrade Synapse (v1.10.1 -> v1.11.0)

---
 roles/matrix-synapse/defaults/main.yml           |  2 +-
 .../templates/synapse/homeserver.yaml.j2         | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/roles/matrix-synapse/defaults/main.yml b/roles/matrix-synapse/defaults/main.yml
index df0b1889a..1564b8437 100644
--- a/roles/matrix-synapse/defaults/main.yml
+++ b/roles/matrix-synapse/defaults/main.yml
@@ -3,7 +3,7 @@
 
 matrix_synapse_enabled: true
 
-matrix_synapse_docker_image: "matrixdotorg/synapse:v1.10.1"
+matrix_synapse_docker_image: "matrixdotorg/synapse:v1.11.0"
 matrix_synapse_docker_image_force_pull: "{{ matrix_synapse_docker_image.endswith(':latest') }}"
 
 matrix_synapse_base_path: "{{ matrix_base_data_path }}/synapse"
diff --git a/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2 b/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2
index 803eb222e..49a9a9063 100644
--- a/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2
+++ b/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2
@@ -1,5 +1,11 @@
 #jinja2: lstrip_blocks: "True"
-# vim:ft=yaml
+# Configuration file for Synapse.
+#
+# This is a YAML file: see [1] for a quick introduction. Note in particular
+# that *indentation is important*: all the elements of a list or dictionary
+# should have the same indentation.
+#
+# [1] https://docs.ansible.com/ansible/latest/reference_appendices/YAMLSyntax.html
 
 ## Server ##
 
@@ -471,6 +477,11 @@ tls_private_key_path: {{ matrix_synapse_tls_private_key_path|to_json }}
 # ACME support: This will configure Synapse to request a valid TLS certificate
 # for your configured `server_name` via Let's Encrypt.
 #
+# Note that ACME v1 is now deprecated, and Synapse currently doesn't support
+# ACME v2. This means that this feature currently won't work with installs set
+# up after November 2019. For more info, and alternative solutions, see
+# https://github.com/matrix-org/synapse/blob/master/docs/ACME.md#deprecation-of-acme-v1
+#
 # Note that provisioning a certificate in this way requires port 80 to be
 # routed to Synapse so that it can complete the http-01 ACME challenge.
 # By default, if you enable ACME support, Synapse will attempt to listen on
@@ -1817,3 +1828,6 @@ opentracing:
     #
     #  logging:
     #    false
+
+
+# vim:ft=yaml

From f28c7b71d26fbad4ebf1307d64559baf7a63ff86 Mon Sep 17 00:00:00 2001
From: Horvath Gergely <horvathg@hekate>
Date: Fri, 21 Feb 2020 18:08:24 +0100
Subject: [PATCH 14/59] build mxisd for rapsberry pi

---
 roles/matrix-base/defaults/main.yml           |  1 +
 roles/matrix-base/tasks/setup_matrix_base.yml |  1 +
 roles/matrix-mxisd/tasks/setup_mxisd.yml      | 34 ++++++++++++++++++-
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/roles/matrix-base/defaults/main.yml b/roles/matrix-base/defaults/main.yml
index 84199623a..b7e0681a5 100644
--- a/roles/matrix-base/defaults/main.yml
+++ b/roles/matrix-base/defaults/main.yml
@@ -29,6 +29,7 @@ matrix_static_files_base_path: "{{ matrix_base_data_path }}/static-files"
 matrix_docker_src_files_path: "{{ matrix_base_data_path }}/docker-src"
 matrix_docker_synapse_src_files_path: "{{ matrix_docker_src_files_path }}/synapse"
 matrix_docker_coturn_src_files_path: "{{ matrix_docker_src_files_path }}/coturn"
+matrix_docker_mxisd_src_files_path: "{{ matrix_docker_src_files_path }}/mxisd"
 matrix_docker_mautrix_facebook_src_files_path: "{{ matrix_docker_src_files_path }}/mautrix-facebook"
 
 matrix_homeserver_url: "https://{{ matrix_server_fqn_matrix }}"
diff --git a/roles/matrix-base/tasks/setup_matrix_base.yml b/roles/matrix-base/tasks/setup_matrix_base.yml
index aa4177eb6..5823e39fa 100644
--- a/roles/matrix-base/tasks/setup_matrix_base.yml
+++ b/roles/matrix-base/tasks/setup_matrix_base.yml
@@ -25,6 +25,7 @@
     - { src: "{{ matrix_docker_src_files_path }}", when: "{{ matrix_raspberry_pi }}" }
     - { src: "{{ matrix_docker_synapse_src_files_path }}", when: "{{ matrix_raspberry_pi }}" }
     - { src: "{{ matrix_docker_coturn_src_files_path }}", when: "{{ matrix_coturn_enabled }}"}
+    - { src: "{{ matrix_docker_mxisd_src_files_path }}", when: "{{ matrix_mxisd_enabled }}"}
     - { src: "{{ matrix_docker_mautrix_facebook_src_files_path }}", when: "{{ matrix_mautrix_facebook_enabled }}"}
 
 # `docker_network` doesn't work as expected when the given network
diff --git a/roles/matrix-mxisd/tasks/setup_mxisd.yml b/roles/matrix-mxisd/tasks/setup_mxisd.yml
index 2bafa1791..b01327223 100644
--- a/roles/matrix-mxisd/tasks/setup_mxisd.yml
+++ b/roles/matrix-mxisd/tasks/setup_mxisd.yml
@@ -22,7 +22,39 @@
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_mxisd_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
     force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_mxisd_docker_image_force_pull }}"
-  when: matrix_mxisd_enabled|bool
+  when: matrix_mxisd_enabled|bool and not matrix_raspberry_pi
+
+- name: Ensure gradel is installed on Raspberry pi for building
+  apt:
+    name:
+      - gradle
+    state: present
+    update_cache: yes    
+  when: "matrix_mxisd_enabled|bool and matrix_raspberry_pi"
+
+- name: Ensure mxisd repository is present on Raspberry pi
+  git:
+    repo: https://github.com/kamax-matrix/mxisd.git
+    dest: "{{ matrix_docker_mxisd_src_files_path }}"
+    version: "v{{ matrix_mxisd_docker_image.split(':')[1] }}"
+    force: "yes"
+  when: "matrix_mxisd_enabled|bool and matrix_raspberry_pi"
+
+# - name: Ensure mxisd Docker image is build (Raspberry pi)
+#   docker_image:
+#     name: "{{ matrix_mxisd_docker_image }}"
+#     source: build
+#     build:
+#       dockerfile: Dockerfile
+#       path: "{{ matrix_docker_mxisd_src_files_path }}"
+#       pull: yes
+#   when: "matrix_mxisd_enabled|bool and matrix_raspberry_pi"
+
+- name: Ensure mxisd Docker image is build (Raspberry pi)
+  shell: "./gradlew dockerBuild"
+  args:
+    chdir: "{{ matrix_docker_mxisd_src_files_path }}"
+  when: "matrix_mxisd_enabled|bool and matrix_raspberry_pi"
 
 - name: Ensure mxisd config installed
   copy:

From 40d0fea06c62938007d439124f0df7f823de0188 Mon Sep 17 00:00:00 2001
From: Horvath Gergely <horvathg@hekate>
Date: Fri, 21 Feb 2020 18:27:26 +0100
Subject: [PATCH 15/59] add mautrix-hangouts support for raspberry pi

---
 roles/matrix-base/defaults/main.yml            |  1 +
 roles/matrix-base/tasks/setup_matrix_base.yml  |  1 +
 .../tasks/setup_install.yml                    | 18 ++++++++++++++++++
 3 files changed, 20 insertions(+)

diff --git a/roles/matrix-base/defaults/main.yml b/roles/matrix-base/defaults/main.yml
index b7e0681a5..f9d88c21e 100644
--- a/roles/matrix-base/defaults/main.yml
+++ b/roles/matrix-base/defaults/main.yml
@@ -31,6 +31,7 @@ matrix_docker_synapse_src_files_path: "{{ matrix_docker_src_files_path }}/synaps
 matrix_docker_coturn_src_files_path: "{{ matrix_docker_src_files_path }}/coturn"
 matrix_docker_mxisd_src_files_path: "{{ matrix_docker_src_files_path }}/mxisd"
 matrix_docker_mautrix_facebook_src_files_path: "{{ matrix_docker_src_files_path }}/mautrix-facebook"
+matrix_docker_mautrix_hangouts_src_files_path: "{{ matrix_docker_src_files_path }}/mautrix-hangouts"
 
 matrix_homeserver_url: "https://{{ matrix_server_fqn_matrix }}"
 
diff --git a/roles/matrix-base/tasks/setup_matrix_base.yml b/roles/matrix-base/tasks/setup_matrix_base.yml
index 5823e39fa..b8384dea3 100644
--- a/roles/matrix-base/tasks/setup_matrix_base.yml
+++ b/roles/matrix-base/tasks/setup_matrix_base.yml
@@ -27,6 +27,7 @@
     - { src: "{{ matrix_docker_coturn_src_files_path }}", when: "{{ matrix_coturn_enabled }}"}
     - { src: "{{ matrix_docker_mxisd_src_files_path }}", when: "{{ matrix_mxisd_enabled }}"}
     - { src: "{{ matrix_docker_mautrix_facebook_src_files_path }}", when: "{{ matrix_mautrix_facebook_enabled }}"}
+    - { src: "{{ matrix_docker_mautrix_hangouts_src_files_path }}", when: "{{ matrix_mautrix_hangouts_enabled }}"}
 
 # `docker_network` doesn't work as expected when the given network
 # is a substring of a network that already exists.
diff --git a/roles/matrix-bridge-mautrix-hangouts/tasks/setup_install.yml b/roles/matrix-bridge-mautrix-hangouts/tasks/setup_install.yml
index 7f3251656..90206fd67 100644
--- a/roles/matrix-bridge-mautrix-hangouts/tasks/setup_install.yml
+++ b/roles/matrix-bridge-mautrix-hangouts/tasks/setup_install.yml
@@ -14,6 +14,24 @@
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_mautrix_hangouts_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
     force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_mautrix_hangouts_docker_image_force_pull }}"
+  when: matrix_mautrix_hangouts_enabled|bool and not matrix_raspberry_pi
+
+- name: Ensure Mautrix Hangots repository is present on Raspberry pi
+  git:
+    repo: https://github.com/tulir/mautrix-hangouts.git
+    dest: "{{ matrix_docker_mautrix_hangouts_src_files_path }}"
+    force: "yes"
+  when: "matrix_mautrix_hangouts_enabled|bool and matrix_raspberry_pi"
+
+- name: Ensure Mautrix Hangouts Docker image is build (Raspberry pi)
+  docker_image:
+    name: "{{ matrix_mautrix_hangouts_docker_image }}"
+    source: build
+    build:
+      dockerfile: Dockerfile
+      path: "{{ matrix_docker_mautrix_hangouts_src_files_path }}"
+      pull: yes
+  when: "matrix_mautrix_hangouts_enabled|bool and matrix_raspberry_pi"
 
 - name: Ensure Mautrix Hangouts paths exist
   file:

From 610c98d6ab5f805f294af00cd79367479c31c86f Mon Sep 17 00:00:00 2001
From: Horvath Gergely <horvathg@hekate>
Date: Fri, 21 Feb 2020 18:51:56 +0100
Subject: [PATCH 16/59] add riot-web support for raspberry pi

---
 roles/matrix-base/defaults/main.yml           |  1 +
 roles/matrix-base/tasks/setup_matrix_base.yml |  1 +
 .../matrix-riot-web/tasks/setup_riot_web.yml  | 20 ++++++++++++++++++-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/roles/matrix-base/defaults/main.yml b/roles/matrix-base/defaults/main.yml
index f9d88c21e..a9fd62242 100644
--- a/roles/matrix-base/defaults/main.yml
+++ b/roles/matrix-base/defaults/main.yml
@@ -28,6 +28,7 @@ matrix_base_data_path_mode: "750"
 matrix_static_files_base_path: "{{ matrix_base_data_path }}/static-files"
 matrix_docker_src_files_path: "{{ matrix_base_data_path }}/docker-src"
 matrix_docker_synapse_src_files_path: "{{ matrix_docker_src_files_path }}/synapse"
+matrix_docker_riot_web_src_files_path: "{{ matrix_docker_src_files_path }}/riot-web"
 matrix_docker_coturn_src_files_path: "{{ matrix_docker_src_files_path }}/coturn"
 matrix_docker_mxisd_src_files_path: "{{ matrix_docker_src_files_path }}/mxisd"
 matrix_docker_mautrix_facebook_src_files_path: "{{ matrix_docker_src_files_path }}/mautrix-facebook"
diff --git a/roles/matrix-base/tasks/setup_matrix_base.yml b/roles/matrix-base/tasks/setup_matrix_base.yml
index b8384dea3..77665f6bb 100644
--- a/roles/matrix-base/tasks/setup_matrix_base.yml
+++ b/roles/matrix-base/tasks/setup_matrix_base.yml
@@ -24,6 +24,7 @@
     - "{{ matrix_base_data_path }}"
     - { src: "{{ matrix_docker_src_files_path }}", when: "{{ matrix_raspberry_pi }}" }
     - { src: "{{ matrix_docker_synapse_src_files_path }}", when: "{{ matrix_raspberry_pi }}" }
+    - { src: "{{ matrix_docker_riot_web_src_files_path }}", when: "{{ matrix_raspberry_pi }}" }
     - { src: "{{ matrix_docker_coturn_src_files_path }}", when: "{{ matrix_coturn_enabled }}"}
     - { src: "{{ matrix_docker_mxisd_src_files_path }}", when: "{{ matrix_mxisd_enabled }}"}
     - { src: "{{ matrix_docker_mautrix_facebook_src_files_path }}", when: "{{ matrix_mautrix_facebook_enabled }}"}
diff --git a/roles/matrix-riot-web/tasks/setup_riot_web.yml b/roles/matrix-riot-web/tasks/setup_riot_web.yml
index a3e1048f9..fcaaeeec4 100644
--- a/roles/matrix-riot-web/tasks/setup_riot_web.yml
+++ b/roles/matrix-riot-web/tasks/setup_riot_web.yml
@@ -19,7 +19,25 @@
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_riot_web_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
     force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_riot_web_docker_image_force_pull }}"
-  when: matrix_riot_web_enabled|bool
+  when: matrix_riot_web_enabled|bool and not matrix_raspberry_pi
+
+- name: Ensure Riot Web repository is present on Raspberry pi
+  git:
+    repo: https://github.com/vector-im/riot-web.git
+    dest: "{{ matrix_docker_riot_web_src_files_path }}"
+    version: "v{{ matrix_riot_web_docker_image.split(':')[1] }}"
+    force: "yes"
+  when: "matrix_riot_web_enabled|bool and matrix_raspberry_pi"
+
+- name: Ensure Riot Web Docker image is build (Raspberry pi)
+  docker_image:
+    name: "{{ matrix_riot_web_docker_image }}"
+    source: build
+    build:
+      dockerfile: Dockerfile
+      path: "{{ matrix_docker_riot_web_src_files_path }}"
+      pull: yes
+  when: "matrix_riot_web_enabled|bool and matrix_raspberry_pi"
 
 - name: Ensure Matrix riot-web configuration installed
   copy:

From 470b9875e7ac9d25cbb92160d110529232ff66bb Mon Sep 17 00:00:00 2001
From: Horvath Gergely <horvathg@hekate>
Date: Sun, 23 Feb 2020 19:32:00 +0100
Subject: [PATCH 17/59] Document raspberry pi support

---
 docs/prerequisites.md |  2 +-
 docs/raspberry-pi.md  | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 docs/raspberry-pi.md

diff --git a/docs/prerequisites.md b/docs/prerequisites.md
index 7b3df42ff..a8b1e6adb 100644
--- a/docs/prerequisites.md
+++ b/docs/prerequisites.md
@@ -1,6 +1,6 @@
 # Prerequisites
 
-- An x86 server running **CentOS** (7 only for now; [8 is not yet supported](https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/300)), **Debian** (9/Stretch+) or **Ubuntu** (16.04+). This playbook doesn't support running on ARM so it won't work on a Raspberry Pi. We only strive to support released stable versions of distributions, not betas or pre-releases. This playbook can take over your whole server or co-exist with other services that you have there.
+- An x86 server running **CentOS** (7 only for now; [8 is not yet supported](https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/300)), **Debian** (9/Stretch+) or **Ubuntu** (16.04+). This playbook doesn't support running on ARM ([see](https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/299)), however some workarounnd exist for the [Raspberry Pi](raspberry-pi.md). We only strive to support released stable versions of distributions, not betas or pre-releases. This playbook can take over your whole server or co-exist with other services that you have there.
 
 - [Python](https://www.python.org/) being installed on the server. Most distributions install Python by default, but some don't (e.g. Ubuntu 18.04) and require manual installation (something like `apt-get install python`).
 
diff --git a/docs/raspberry-pi.md b/docs/raspberry-pi.md
new file mode 100644
index 000000000..d5cd0f071
--- /dev/null
+++ b/docs/raspberry-pi.md
@@ -0,0 +1,17 @@
+# Raspberry Pi
+
+The playbook support for Raspberry Pi is now in beta(ish). The problem is that, docker containers are not architecture independent, and most of them are not build for arm. Some roles have been updated, so they built the necessary image on the host. It needs more space, as some build tools need to be present (like Java, for mxisd).
+
+To use these modification there is a variable that needs to be switched to enable this functionality. Add this to your vars.yaml file:
+```
+matrix_raspberry_pi = true
+```
+
+List of roles that builtds the image:
+- synapse
+- coturn
+- mxisd
+- matrix-bridge-mautrix-facebook
+- matrix-bridge-mautrix-hangouts
+
+nginx hopefully works as it has an arm image already.

From 6ba961bd113734c9686ee9e3e7f2d57e495e5fba Mon Sep 17 00:00:00 2001
From: Aaron Raimist <aaron@raim.ist>
Date: Sun, 23 Feb 2020 12:35:29 -0600
Subject: [PATCH 18/59] Upgrade riot-web (1.5.9 -> 1.5.10)

---
 roles/matrix-riot-web/defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/matrix-riot-web/defaults/main.yml b/roles/matrix-riot-web/defaults/main.yml
index 105bc96a2..05f6b796d 100644
--- a/roles/matrix-riot-web/defaults/main.yml
+++ b/roles/matrix-riot-web/defaults/main.yml
@@ -1,6 +1,6 @@
 matrix_riot_web_enabled: true
 
-matrix_riot_web_docker_image: "vectorim/riot-web:v1.5.9"
+matrix_riot_web_docker_image: "vectorim/riot-web:v1.5.10"
 matrix_riot_web_docker_image_force_pull: "{{ matrix_riot_web_docker_image.endswith(':latest') }}"
 
 matrix_riot_web_data_path: "{{ matrix_base_data_path }}/riot-web"

From f56825580ded2b0450888e66b2f396cdb115530f Mon Sep 17 00:00:00 2001
From: Horvath Gergely <horvathg@hekate>
Date: Mon, 24 Feb 2020 08:59:10 +0100
Subject: [PATCH 19/59] hangouts-bridge no-proxy warning does not trigger when
 'matrix_nginx_proxy_enabled = false' is explicitly set

---
 roles/matrix-bridge-mautrix-hangouts/tasks/init.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/matrix-bridge-mautrix-hangouts/tasks/init.yml b/roles/matrix-bridge-mautrix-hangouts/tasks/init.yml
index ee18eeb0e..e4f48afc8 100644
--- a/roles/matrix-bridge-mautrix-hangouts/tasks/init.yml
+++ b/roles/matrix-bridge-mautrix-hangouts/tasks/init.yml
@@ -59,4 +59,4 @@
       Please make sure that you're proxying the `{{ matrix_mautrix_hangouts_public_endpoint }}`
       URL endpoint to the matrix-mautrix-hangouts container.
       You can expose the container's port using the `matrix_mautrix_hangouts_container_http_host_bind_port` variable.
-  when: "matrix_mautrix_hangouts_enabled|bool and matrix_nginx_proxy_enabled is not defined"
+  when: "matrix_mautrix_hangouts_enabled|bool and (matrix_nginx_proxy_enabled is not defined or matrix_nginx_proxy_enabled|bool == false)"

From 7a45c651d2cb8775b56e9df839f64a31e8d39b1d Mon Sep 17 00:00:00 2001
From: Julian Foad <julian@foad.me.uk>
Date: Mon, 24 Feb 2020 13:55:00 +0000
Subject: [PATCH 20/59] Use new syntax for default HS/IS in Riot config.

This change makes no difference in itself, but is a pre-requisite for
adding the 'server name' config, and the old syntax is deprecated.
---
 roles/matrix-riot-web/templates/config.json.j2 | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/roles/matrix-riot-web/templates/config.json.j2 b/roles/matrix-riot-web/templates/config.json.j2
index 69fb13931..6fc790776 100644
--- a/roles/matrix-riot-web/templates/config.json.j2
+++ b/roles/matrix-riot-web/templates/config.json.j2
@@ -1,6 +1,12 @@
 {
-	"default_hs_url": {{ matrix_riot_web_default_hs_url|string|to_json }},
-	"default_is_url": {{ matrix_riot_web_default_is_url|string|to_json }},
+	"default_server_config": {
+		"m.homeserver": {
+			"base_url": {{ matrix_riot_web_default_hs_url|string|to_json }},
+		},
+		"m.identity_server": {
+			"base_url": {{ matrix_riot_web_default_is_url|string|to_json }}
+		}
+	},
 	"disable_custom_urls": {{ matrix_riot_web_disable_custom_urls|to_json }},
 	"disable_guests": {{ matrix_riot_web_disable_guests|to_json }},
 	"brand": {{ matrix_riot_web_brand|to_json }},

From 3228cfd229b74c05e3bab520c0ec45f5bb8f015e Mon Sep 17 00:00:00 2001
From: Julian Foad <julian@foad.me.uk>
Date: Mon, 24 Feb 2020 14:00:43 +0000
Subject: [PATCH 21/59] Add custom server name string in Riot config.

This adds into the Riot config.json the field
  'default_server_config.m.homeserver.server_name'
with, by default, the value of the playbook's 'matrix_domain' variable.

Riot displays this string in its login page and will now say 'Sign in to
your Matrix account on example.org' (the server name) instead of 'Sign
in ... on matrix.example.org' (the server domain-name).

This string can be configured by setting the playbook variable
  'matrix_riot_web_default_server_name'
to any string, so we can make Riot say for example 'Sign in ... on Our
Server'.
---
 roles/matrix-riot-web/defaults/main.yml        | 1 +
 roles/matrix-riot-web/templates/config.json.j2 | 1 +
 2 files changed, 2 insertions(+)

diff --git a/roles/matrix-riot-web/defaults/main.yml b/roles/matrix-riot-web/defaults/main.yml
index 05f6b796d..cec6c8eac 100644
--- a/roles/matrix-riot-web/defaults/main.yml
+++ b/roles/matrix-riot-web/defaults/main.yml
@@ -17,6 +17,7 @@ matrix_riot_web_container_extra_arguments: []
 matrix_riot_web_systemd_required_services_list: ['docker.service']
 
 # Riot config.json customizations
+matrix_riot_web_default_server_name: "{{ matrix_domain }}"
 matrix_riot_web_default_hs_url: ""
 matrix_riot_web_default_is_url: ~
 matrix_riot_web_disable_custom_urls: true
diff --git a/roles/matrix-riot-web/templates/config.json.j2 b/roles/matrix-riot-web/templates/config.json.j2
index 6fc790776..16a0cf4cf 100644
--- a/roles/matrix-riot-web/templates/config.json.j2
+++ b/roles/matrix-riot-web/templates/config.json.j2
@@ -2,6 +2,7 @@
 	"default_server_config": {
 		"m.homeserver": {
 			"base_url": {{ matrix_riot_web_default_hs_url|string|to_json }},
+			"server_name": {{ matrix_riot_web_default_server_name|string|to_json }}
 		},
 		"m.identity_server": {
 			"base_url": {{ matrix_riot_web_default_is_url|string|to_json }}

From 0703c31e11ed813632c692e8e2fa42e123ea5754 Mon Sep 17 00:00:00 2001
From: Julian Foad <julian@foad.me.uk>
Date: Mon, 24 Feb 2020 14:55:08 +0000
Subject: [PATCH 22/59] Document the new Riot server name setting.

---
 CHANGELOG.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f5f62f41..53ee3295a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,20 @@
+# 2020-02-24
+
+## Customize the server name in Riot's login page
+
+You can now customize the server name string that Riot-web displays in its login page.
+
+These playbook variables, with these default values, have been added:
+
+```
+matrix_riot_web_default_server_name: "{{ matrix_domain }}"
+```
+
+The login page previously said "Sign in to your Matrix account on matrix.example.org" (the homeserver's domain name). It will now say "Sign in ... on example.org" (the server name) by default, or "Sign in ... on Our Server" if you set the variable to "Our Server".
+
+To support this, the config.json template is changed to use the configuration key `default_server_config` for setting the default HS/IS, and the new configuration key `server_name` is added in there.
+
+
 # 2020-01-30
 
 ## Disabling TLSv1.1

From dc5eaddc3d18904a43be6f4c3a40826d77b7be67 Mon Sep 17 00:00:00 2001
From: iLyas Bakouch <isbkch@gmail.com>
Date: Tue, 25 Feb 2020 19:01:32 -0500
Subject: [PATCH 23/59] quick typo

---
 docs/configuring-playbook-bridge-appservice-webhooks.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/configuring-playbook-bridge-appservice-webhooks.md b/docs/configuring-playbook-bridge-appservice-webhooks.md
index 0e3553597..a48511461 100644
--- a/docs/configuring-playbook-bridge-appservice-webhooks.md
+++ b/docs/configuring-playbook-bridge-appservice-webhooks.md
@@ -28,18 +28,18 @@ matrix_appservice_webhooks_log_level: '<log_level>'
 
 4. If you're using the [Dimension Integration Manager](configuring-playbook-dimension.md), you can configure the Webhooks bridge by opening the Dimension integration manager -> Settings -> Bridges and selecting edit action for "Webhook Bridge". Press "Add self-hosted Bridge" button and populate "Provisioning URL"  & "Shared Secret" values from `/matrix/appservice-webhooks/config/config.yaml` file's homeserver URL value and provisioning secret value, respectively. 
 
-4. Invite the bridge bot user to your room:
+5. Invite the bridge bot user to your room:
 
     - either with `/invite @_webhook:<domain.name>` (*Note*: Make sure you have administration permissions in your room)
 
     - or simply add the bridge bot to a private channel (personal channels imply you being an administrator)
 
-5. Send a message to the bridge bot in order to receive a private message including the webhook link.
+6. Send a message to the bridge bot in order to receive a private message including the webhook link.
 ```
 !webhook
 ```
 
-6. The JSON body for posting messages will have to look like this:
+7. The JSON body for posting messages will have to look like this:
 ```json
 {
     "text": "Hello world!",

From 37f3a2d5a80124d7be897a748e6f1476c62909f0 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Wed, 26 Feb 2020 08:40:25 +0200
Subject: [PATCH 24/59] Add support for themes to riot-web

---
 .gitignore                                    |  1 +
 CHANGELOG.md                                  |  9 ++++
 docs/configuring-playbook-riot-web.md         | 11 +++++
 roles/matrix-riot-web/defaults/main.yml       | 15 ++++++
 roles/matrix-riot-web/tasks/main.yml          |  6 +++
 .../tasks/prepare_riot_web_themes.yml         | 48 +++++++++++++++++++
 .../matrix-riot-web/templates/config.json.j2  |  3 ++
 7 files changed, 93 insertions(+)
 create mode 100644 roles/matrix-riot-web/tasks/prepare_riot_web_themes.yml

diff --git a/.gitignore b/.gitignore
index d373e2580..e3f61b55f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /inventory/*
 !/inventory/.gitkeep
 !/inventory/host_vars/.gitkeep
+/roles/*/files/scratchpad
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53ee3295a..32153869d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+# 2020-02-26
+
+## Riot-web themes are here
+
+The playbook now makes it easy to install custom riot-web themes.
+
+To learn more, take a look at our [riot-web documentation on Themes](docs/configuring-playbook-riot-web.md#themes).
+
+
 # 2020-02-24
 
 ## Customize the server name in Riot's login page
diff --git a/docs/configuring-playbook-riot-web.md b/docs/configuring-playbook-riot-web.md
index af8e21751..119073081 100644
--- a/docs/configuring-playbook-riot-web.md
+++ b/docs/configuring-playbook-riot-web.md
@@ -27,3 +27,14 @@ Alternatively, **if there is no pre-defined variable** for a riot-web setting yo
 - or, you can **extend and override the default configuration** ([`config.json.j2`](../roles/matrix-riot-web/templates/config.json.j2)) by making use of the `matrix_riot_web_configuration_extension_json_` variable. You can find information about this in [`roles/matrix-riot-web/defaults/main.yml`](../roles/matrix-riot-web/defaults/main.yml).
 
 - or, if extending the configuration is still not powerful enough for your needs, you can **override the configuration completely** using `matrix_riot_web_configuration_default` (or `matrix_riot_web_configuration`). You can find information about this in [`roles/matrix-riot-web/defaults/main.yml`](../roles/matrix-riot-web/defaults/main.yml).
+
+
+## Themes
+
+To change the look of riot-web, you can define your own themes manually by using the `matrix_riot_web_settingDefaults_custom_themes` setting.
+
+Or better yet, you can automatically pull it all themes provided by the [aaronraimist/riot-web-themes](https://github.com/aaronraimist/riot-web-themes) project by simply flipping a flag (`matrix_riot_web_themes_enabled: true`).
+
+If you make your own theme, we encourage you to submit it to the **aaronraimist/riot-web-themes** project, so that the whole community could easily enjoy it.
+
+Note that for a custom theme to work well, all riot-web/riot-desktop instances that you use must have the same theme installed.
diff --git a/roles/matrix-riot-web/defaults/main.yml b/roles/matrix-riot-web/defaults/main.yml
index cec6c8eac..f4d1c2331 100644
--- a/roles/matrix-riot-web/defaults/main.yml
+++ b/roles/matrix-riot-web/defaults/main.yml
@@ -45,6 +45,21 @@ matrix_riot_web_registration_enabled: false
 # Controls whether Riot shows the presence features
 matrix_riot_web_enable_presence_by_hs_url: ~
 
+# Controls whether custom riot-web themes will be installed.
+# When enabled, all themes found in the `matrix_riot_web_themes_repository_url` repository
+# will be installed and enabled automatically.
+matrix_riot_web_themes_enabled: false
+matrix_riot_web_themes_repository_url: https://github.com/aaronraimist/riot-web-themes
+
+# Controls the `settingsDefault.custom_themes` setting of the riot-web configuration.
+# You can use this setting to define custom themes.
+#
+# Also, look at `matrix_riot_web_themes_enabled` for a way to pull in a bunch of custom themes automatically.
+# If you define your own themes here and set `matrix_riot_web_themes_enabled: true`, your themes will be preserved as well.
+#
+# Note that for a custom theme to work well, all riot-web/riot-desktop instances that you use must have the same theme installed.
+matrix_riot_web_settingDefaults_custom_themes: []
+
 # Default riot-web configuration template which covers the generic use case.
 # You can customize it by controlling the various variables inside it.
 #
diff --git a/roles/matrix-riot-web/tasks/main.yml b/roles/matrix-riot-web/tasks/main.yml
index 5792517e3..a5b4aff59 100644
--- a/roles/matrix-riot-web/tasks/main.yml
+++ b/roles/matrix-riot-web/tasks/main.yml
@@ -8,6 +8,12 @@
     - setup-all
     - setup-riot-web
 
+- import_tasks: "{{ role_path }}/tasks/prepare_riot_web_themes.yml"
+  when: run_setup|bool
+  tags:
+    - setup-all
+    - setup-riot-web
+
 - import_tasks: "{{ role_path }}/tasks/setup_riot_web.yml"
   when: run_setup|bool
   tags:
diff --git a/roles/matrix-riot-web/tasks/prepare_riot_web_themes.yml b/roles/matrix-riot-web/tasks/prepare_riot_web_themes.yml
new file mode 100644
index 000000000..4171db3a4
--- /dev/null
+++ b/roles/matrix-riot-web/tasks/prepare_riot_web_themes.yml
@@ -0,0 +1,48 @@
+---
+
+#
+# Tasks related to setting up riot-web themes
+#
+
+- block:
+  - name: Ensure riot-web themes repository is pulled
+    git:
+      repo: "{{ matrix_riot_web_themes_repository_url }}"
+      dest: "{{ role_path }}/files/scratchpad/riot-web-themes"
+
+  - name: Find all riot-web theme files
+    find:
+      paths: "{{ role_path }}/files/scratchpad/riot-web-themes"
+      patterns: "*.json"
+      recurse: true
+    register: matrix_riot_web_theme_file_list
+
+  - name: Read riot-web theme
+    slurp:
+      path: "{{ item.path }}"
+    register: "matrix_riot_web_theme_file_contents"
+    with_items: "{{ matrix_riot_web_theme_file_list.files }}"
+
+  - name: Load riot-web theme
+    set_fact:
+     matrix_riot_web_settingDefaults_custom_themes: "{{ matrix_riot_web_settingDefaults_custom_themes + [item['content'] | b64decode | from_json] }}"
+    with_items: "{{ matrix_riot_web_theme_file_contents.results }}"
+
+  run_once: true
+  delegate_to: 127.0.0.1
+  become: false
+  when: matrix_riot_web_themes_enabled|bool
+
+
+# #
+# # Tasks related to getting rid of riot-web themes (if it was previously enabled)
+# #
+
+- name: Ensure riot-web themes repository is removed
+  file:
+    path: "{{ role_path }}/files/scratchpad/riot-web-themes"
+    state: absent
+  run_once: true
+  delegate_to: 127.0.0.1
+  become: false
+  when: "not matrix_riot_web_themes_enabled|bool"
diff --git a/roles/matrix-riot-web/templates/config.json.j2 b/roles/matrix-riot-web/templates/config.json.j2
index 16a0cf4cf..635c06f51 100644
--- a/roles/matrix-riot-web/templates/config.json.j2
+++ b/roles/matrix-riot-web/templates/config.json.j2
@@ -8,6 +8,9 @@
 			"base_url": {{ matrix_riot_web_default_is_url|string|to_json }}
 		}
 	},
+	"settingDefaults": {
+		"custom_themes": {{ matrix_riot_web_settingDefaults_custom_themes|to_json }}
+	},
 	"disable_custom_urls": {{ matrix_riot_web_disable_custom_urls|to_json }},
 	"disable_guests": {{ matrix_riot_web_disable_guests|to_json }},
 	"brand": {{ matrix_riot_web_brand|to_json }},

From d5e5572f2c68c1aa0c5a8a9f788e2f9f0758ed23 Mon Sep 17 00:00:00 2001
From: Stefan Warnat <warnat@redoo-networks.com>
Date: Mon, 2 Mar 2020 18:36:58 +0100
Subject: [PATCH 25/59] switch Port, which is exposed to same, which is
 internal used

---
 .../templates/systemd/matrix-appservice-webhooks.service.j2     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/matrix-bridge-appservice-webhooks/templates/systemd/matrix-appservice-webhooks.service.j2 b/roles/matrix-bridge-appservice-webhooks/templates/systemd/matrix-appservice-webhooks.service.j2
index f83e73465..cde798df2 100644
--- a/roles/matrix-bridge-appservice-webhooks/templates/systemd/matrix-appservice-webhooks.service.j2
+++ b/roles/matrix-bridge-appservice-webhooks/templates/systemd/matrix-appservice-webhooks.service.j2
@@ -23,7 +23,7 @@ ExecStart=/usr/bin/docker run --rm --name matrix-appservice-webhooks \
 			--cap-drop=ALL \
 			--network={{ matrix_docker_network }} \
 			{% if matrix_appservice_webhooks_container_http_host_bind_port %}
-			-p {{ matrix_appservice_webhooks_container_http_host_bind_port }}:{{matrix_appservice_webhooks_webhooks_port}} \
+			-p {{ matrix_appservice_webhooks_container_http_host_bind_port }}:{{matrix_appservice_webhooks_matrix_port}} \
 			{% endif %}
 			-v {{ matrix_appservice_webhooks_config_path }}:/config:z \
 			-v {{ matrix_appservice_webhooks_data_path }}:/data:z \

From 209e7165802d6935f4c6623ab3d8763cdbaeedd1 Mon Sep 17 00:00:00 2001
From: tctovsli <Tctovsli@gmail.com>
Date: Tue, 3 Mar 2020 09:08:37 +0100
Subject: [PATCH 26/59] New version of matrix-riot-web

---
 roles/matrix-riot-web/defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/matrix-riot-web/defaults/main.yml b/roles/matrix-riot-web/defaults/main.yml
index f4d1c2331..be19fef94 100644
--- a/roles/matrix-riot-web/defaults/main.yml
+++ b/roles/matrix-riot-web/defaults/main.yml
@@ -1,6 +1,6 @@
 matrix_riot_web_enabled: true
 
-matrix_riot_web_docker_image: "vectorim/riot-web:v1.5.10"
+matrix_riot_web_docker_image: "vectorim/riot-web:v1.5.11"
 matrix_riot_web_docker_image_force_pull: "{{ matrix_riot_web_docker_image.endswith(':latest') }}"
 
 matrix_riot_web_data_path: "{{ matrix_base_data_path }}/riot-web"

From be6c048abe434178a4c296139fa6429b3f163065 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Tue, 3 Mar 2020 12:38:21 +0200
Subject: [PATCH 27/59] Remove useless matrix_appservice_webhooks_webhooks_port

In relation to #392 (Github Issue)
---
 group_vars/matrix_servers                                 | 2 +-
 roles/matrix-bridge-appservice-webhooks/defaults/main.yml | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers
index 1c7ac23fd..192d43383 100755
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@@ -72,7 +72,7 @@ matrix_appservice_webhooks_enabled: false
 # Normally, matrix-nginx-proxy is enabled and nginx can reach matrix-appservice-webhooks over the container network.
 # If matrix-nginx-proxy is not enabled, or you otherwise have a need for it, you can expose
 # matrix-appservice-webhooks' client-server port to the local host.
-matrix_appservice_webhooks_container_http_host_bind_port: "{{ '' if matrix_nginx_proxy_enabled else '127.0.0.1:{{ matrix_appservice_webhooks_webhooks_port }}' }}"
+matrix_appservice_webhooks_container_http_host_bind_port: "{{ '' if matrix_nginx_proxy_enabled else '127.0.0.1:{{ matrix_appservice_webhooks_matrix_port }}' }}"
 
 matrix_appservice_webhooks_appservice_token: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'webhook.as.token') | to_uuid }}"
 
diff --git a/roles/matrix-bridge-appservice-webhooks/defaults/main.yml b/roles/matrix-bridge-appservice-webhooks/defaults/main.yml
index 09daa22bd..1b2c99405 100644
--- a/roles/matrix-bridge-appservice-webhooks/defaults/main.yml
+++ b/roles/matrix-bridge-appservice-webhooks/defaults/main.yml
@@ -21,9 +21,8 @@ matrix_appservice_webhooks_user_prefix: '_webhook'
 
 # Controls the webhooks_PORT and MATRIX_PORT of the installation
 matrix_appservice_webhooks_matrix_port: 6789
-matrix_appservice_webhooks_webhooks_port: 6788
 
-# Controls whether the appservice-webhooks container exposes its HTTP port (tcp/6788 in the container).
+# Controls whether the appservice-webhooks container exposes its HTTP port (tcp/6789 in the container).
 #
 # Takes an "<ip>:<port>" or "<port>" value (e.g. "127.0.0.1:9999"), or empty string to not expose.
 matrix_appservice_webhooks_container_http_host_bind_port: ''

From a727e7c4978ef963e5f19ef70d7b12eb5f55535c Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Tue, 3 Mar 2020 17:32:22 +0200
Subject: [PATCH 28/59] Upgrade Synapse (v1.11.0 -> v1.11.1)

---
 roles/matrix-synapse/defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/matrix-synapse/defaults/main.yml b/roles/matrix-synapse/defaults/main.yml
index 1564b8437..05ad9126a 100644
--- a/roles/matrix-synapse/defaults/main.yml
+++ b/roles/matrix-synapse/defaults/main.yml
@@ -3,7 +3,7 @@
 
 matrix_synapse_enabled: true
 
-matrix_synapse_docker_image: "matrixdotorg/synapse:v1.11.0"
+matrix_synapse_docker_image: "matrixdotorg/synapse:v1.11.1"
 matrix_synapse_docker_image_force_pull: "{{ matrix_synapse_docker_image.endswith(':latest') }}"
 
 matrix_synapse_base_path: "{{ matrix_base_data_path }}/synapse"

From 4a06e52660f01560f211170603a4e78434c00f9f Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Tue, 3 Mar 2020 17:48:51 +0200
Subject: [PATCH 29/59] Fix matrix-appservice-slack configuration when
 matrix-nginx-proxy is disabled

---
 group_vars/matrix_servers | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers
index 192d43383..5efde0c95 100755
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@@ -106,7 +106,7 @@ matrix_appservice_slack_enabled: false
 # Normally, matrix-nginx-proxy is enabled and nginx can reach matrix-appservice-slack over the container network.
 # If matrix-nginx-proxy is not enabled, or you otherwise have a need for it, you can expose
 # matrix-appservice-slack's client-server port to the local host.
-matrix_appservice_slack_container_http_host_bind_port: "{{ '' if matrix_nginx_proxy_enabled else '127.0.0.1:{{ matrix_appservice_slack_slack_port }}' }}"
+matrix_appservice_slack_container_http_host_bind_port: "{{ '' if matrix_nginx_proxy_enabled else ('127.0.0.1:' ~ matrix_appservice_slack_slack_port) }}"
 
 matrix_appservice_slack_appservice_token: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'slack.as.token') | to_uuid }}"
 

From 8bc4f56385eeb7ff45e41f7985940875f1f76b43 Mon Sep 17 00:00:00 2001
From: Stefan Warnat <warnat@redoo-networks.com>
Date: Tue, 3 Mar 2020 19:01:43 +0100
Subject: [PATCH 30/59] Improve customization of welcome page

---
 roles/matrix-riot-web/defaults/main.yml         | 6 ++++++
 roles/matrix-riot-web/templates/welcome.html.j2 | 8 ++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/roles/matrix-riot-web/defaults/main.yml b/roles/matrix-riot-web/defaults/main.yml
index be19fef94..8b19f297b 100644
--- a/roles/matrix-riot-web/defaults/main.yml
+++ b/roles/matrix-riot-web/defaults/main.yml
@@ -32,6 +32,12 @@ matrix_riot_web_welcome_user_id: "@riot-bot:matrix.org"
 # Branding of riot web
 matrix_riot_web_brand: "Riot"
 
+matrix_riot_web_welcome_logo: "welcome/images/logo.svg"
+matrix_riot_web_welcome_logo_link: "https://riot.im"
+
+matrix_riot_web_welcome_headline: "_t('Welcome to Riot.im')"
+matrix_riot_web_welcome_text: "_t('Decentralised, encrypted chat &amp; collaboration powered by [matrix]')"
+
 # By default, there's no Riot homepage (when logged in). If you wish to have one,
 # point this to a `home.html` template file on your local filesystem.
 matrix_riot_web_embedded_pages_home_path: ~
diff --git a/roles/matrix-riot-web/templates/welcome.html.j2 b/roles/matrix-riot-web/templates/welcome.html.j2
index 319f9795f..48a0f5325 100644
--- a/roles/matrix-riot-web/templates/welcome.html.j2
+++ b/roles/matrix-riot-web/templates/welcome.html.j2
@@ -153,11 +153,11 @@ h1::after {
 </style>
 
 <div class="mx_Parent">
-    <a href="https://riot.im" target="_blank" rel="noopener">
-        <img src="welcome/images/logo.svg" alt="" class="mx_Logo"/>
+    <a href="{{ matrix_riot_web_welcome_logo_link }}" target="_blank" rel="noopener">
+        <img src="{{ matrix_riot_web_welcome_logo }}" alt="" class="mx_Logo"/>
     </a>
-    <h1 class="mx_Header_title">_t("Welcome to Riot.im")</h1>
-    <h4 class="mx_Header_subtitle">_t("Decentralised, encrypted chat &amp; collaboration powered by [matrix]")</h4>
+    <h1 class="mx_Header_title">{{ matrix_riot_web_welcome_headline }}</h1>
+    <h4 class="mx_Header_subtitle">{{ matrix_riot_web_welcome_text }}</h4>
     <div class="mx_ButtonGroup">
         <div class="mx_ButtonRow">
             <a href="#/login" class="mx_ButtonParent mx_ButtonSignIn mx_Button_iconSignIn">

From 0322a5443a6b05ef0e4c6ec5b76d4a46792198a8 Mon Sep 17 00:00:00 2001
From: Stefan Warnat <warnat@redoo-networks.com>
Date: Tue, 3 Mar 2020 22:16:52 +0100
Subject: [PATCH 31/59] additional customizations of welcome page

---
 roles/matrix-riot-web/defaults/main.yml        | 13 +++++++++++++
 roles/matrix-riot-web/templates/config.json.j2 |  5 +++++
 2 files changed, 18 insertions(+)

diff --git a/roles/matrix-riot-web/defaults/main.yml b/roles/matrix-riot-web/defaults/main.yml
index 8b19f297b..4fe8703a8 100644
--- a/roles/matrix-riot-web/defaults/main.yml
+++ b/roles/matrix-riot-web/defaults/main.yml
@@ -32,7 +32,20 @@ matrix_riot_web_welcome_user_id: "@riot-bot:matrix.org"
 # Branding of riot web
 matrix_riot_web_brand: "Riot"
 
+# Links, shown in footer of welcome page:
+# [{"text": "Link text", "url": "https://link.target"}, {"text": "Other link"}]
+matrix_riot_web_welcome_footerlinks: false
+
+# URL to image, shown during Login
+matrix_riot_web_welcome_authlogo: false
+
+# URL to Wallpaper, shown in background of welcome page
+matrix_riot_web_welcome_background: false
+
+# URL to Logo on welcome page
 matrix_riot_web_welcome_logo: "welcome/images/logo.svg"
+
+# URL of link on welcome image
 matrix_riot_web_welcome_logo_link: "https://riot.im"
 
 matrix_riot_web_welcome_headline: "_t('Welcome to Riot.im')"
diff --git a/roles/matrix-riot-web/templates/config.json.j2 b/roles/matrix-riot-web/templates/config.json.j2
index 635c06f51..a950f70ec 100644
--- a/roles/matrix-riot-web/templates/config.json.j2
+++ b/roles/matrix-riot-web/templates/config.json.j2
@@ -29,5 +29,10 @@
 	{% endif %}
 	"embeddedPages": {
 		"homeUrl": {{ matrix_riot_web_embedded_pages_home_url|string|to_json }}
+	},
+	"branding": {
+		"authFooterLinks": {{ matrix_riot_web_welcome_footerlinks|to_json }},
+		"authHeaderLogoUrl": {{ matrix_riot_web_welcome_authlogo|to_json }},
+		"welcomeBackgroundUrl": {{ matrix_riot_web_welcome_background|to_json }}
 	}
 }

From 054e6fed0cef8e883d99351539cd3ade1c5a3f50 Mon Sep 17 00:00:00 2001
From: Stefan Warnat <warnat@redoo-networks.com>
Date: Tue, 3 Mar 2020 22:27:39 +0100
Subject: [PATCH 32/59] rearrange main.yml of riot-web and use same logo URL
 for both logos

---
 roles/matrix-riot-web/defaults/main.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/roles/matrix-riot-web/defaults/main.yml b/roles/matrix-riot-web/defaults/main.yml
index 4fe8703a8..828532f50 100644
--- a/roles/matrix-riot-web/defaults/main.yml
+++ b/roles/matrix-riot-web/defaults/main.yml
@@ -32,16 +32,6 @@ matrix_riot_web_welcome_user_id: "@riot-bot:matrix.org"
 # Branding of riot web
 matrix_riot_web_brand: "Riot"
 
-# Links, shown in footer of welcome page:
-# [{"text": "Link text", "url": "https://link.target"}, {"text": "Other link"}]
-matrix_riot_web_welcome_footerlinks: false
-
-# URL to image, shown during Login
-matrix_riot_web_welcome_authlogo: false
-
-# URL to Wallpaper, shown in background of welcome page
-matrix_riot_web_welcome_background: false
-
 # URL to Logo on welcome page
 matrix_riot_web_welcome_logo: "welcome/images/logo.svg"
 
@@ -51,6 +41,16 @@ matrix_riot_web_welcome_logo_link: "https://riot.im"
 matrix_riot_web_welcome_headline: "_t('Welcome to Riot.im')"
 matrix_riot_web_welcome_text: "_t('Decentralised, encrypted chat &amp; collaboration powered by [matrix]')"
 
+# Links, shown in footer of welcome page:
+# [{"text": "Link text", "url": "https://link.target"}, {"text": "Other link"}]
+matrix_riot_web_welcome_footerlinks: false
+
+# URL to image, shown during Login
+matrix_riot_web_welcome_authlogo: "{{ matrix_riot_web_welcome_logo }}"
+
+# URL to Wallpaper, shown in background of welcome page
+matrix_riot_web_welcome_background: false
+
 # By default, there's no Riot homepage (when logged in). If you wish to have one,
 # point this to a `home.html` template file on your local filesystem.
 matrix_riot_web_embedded_pages_home_path: ~

From 00596452c2e2ff3c33b7ada41a06da4383c8ffdb Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Thu, 5 Mar 2020 10:53:31 +0200
Subject: [PATCH 33/59] Update riot-web (1.5.11 -> 1.5.12)

---
 roles/matrix-riot-web/defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/matrix-riot-web/defaults/main.yml b/roles/matrix-riot-web/defaults/main.yml
index be19fef94..c192e42d2 100644
--- a/roles/matrix-riot-web/defaults/main.yml
+++ b/roles/matrix-riot-web/defaults/main.yml
@@ -1,6 +1,6 @@
 matrix_riot_web_enabled: true
 
-matrix_riot_web_docker_image: "vectorim/riot-web:v1.5.11"
+matrix_riot_web_docker_image: "vectorim/riot-web:v1.5.12"
 matrix_riot_web_docker_image_force_pull: "{{ matrix_riot_web_docker_image.endswith(':latest') }}"
 
 matrix_riot_web_data_path: "{{ matrix_base_data_path }}/riot-web"

From 46664c4758a5e51545850f8f298525caf654fafc Mon Sep 17 00:00:00 2001
From: Stefan Warnat <warnat@redoo-networks.com>
Date: Fri, 6 Mar 2020 14:31:15 +0100
Subject: [PATCH 34/59] Adjust variable names

---
 roles/matrix-riot-web/defaults/main.yml        | 6 +++---
 roles/matrix-riot-web/templates/config.json.j2 | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/roles/matrix-riot-web/defaults/main.yml b/roles/matrix-riot-web/defaults/main.yml
index 828532f50..981978d2c 100644
--- a/roles/matrix-riot-web/defaults/main.yml
+++ b/roles/matrix-riot-web/defaults/main.yml
@@ -43,13 +43,13 @@ matrix_riot_web_welcome_text: "_t('Decentralised, encrypted chat &amp; collabora
 
 # Links, shown in footer of welcome page:
 # [{"text": "Link text", "url": "https://link.target"}, {"text": "Other link"}]
-matrix_riot_web_welcome_footerlinks: false
+matrix_riot_web_branding_authFooterLinks: ~
 
 # URL to image, shown during Login
-matrix_riot_web_welcome_authlogo: "{{ matrix_riot_web_welcome_logo }}"
+matrix_riot_web_branding_authHeaderLogoUrl: "{{ matrix_riot_web_welcome_logo }}"
 
 # URL to Wallpaper, shown in background of welcome page
-matrix_riot_web_welcome_background: false
+matrix_riot_web_branding_welcomeBackgroundUrl: ~
 
 # By default, there's no Riot homepage (when logged in). If you wish to have one,
 # point this to a `home.html` template file on your local filesystem.
diff --git a/roles/matrix-riot-web/templates/config.json.j2 b/roles/matrix-riot-web/templates/config.json.j2
index a950f70ec..b82d53e07 100644
--- a/roles/matrix-riot-web/templates/config.json.j2
+++ b/roles/matrix-riot-web/templates/config.json.j2
@@ -31,8 +31,8 @@
 		"homeUrl": {{ matrix_riot_web_embedded_pages_home_url|string|to_json }}
 	},
 	"branding": {
-		"authFooterLinks": {{ matrix_riot_web_welcome_footerlinks|to_json }},
-		"authHeaderLogoUrl": {{ matrix_riot_web_welcome_authlogo|to_json }},
-		"welcomeBackgroundUrl": {{ matrix_riot_web_welcome_background|to_json }}
+		"authFooterLinks": {{ matrix_riot_web_branding_authFooterLinks|to_json }},
+		"authHeaderLogoUrl": {{ matrix_riot_web_branding_authHeaderLogoUrl|to_json }},
+		"welcomeBackgroundUrl": {{ matrix_riot_web_branding_welcomeBackgroundUrl|to_json }}
 	}
 }

From c55682d0992ddfb7449d0cb27fe03781c8571b05 Mon Sep 17 00:00:00 2001
From: David Gnedt <dgnedt@sba-research.org>
Date: Fri, 6 Mar 2020 17:48:16 +0100
Subject: [PATCH 35/59] Update synapse-janitor to support current synapse
 database schema

---
 roles/matrix-postgres/defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/matrix-postgres/defaults/main.yml b/roles/matrix-postgres/defaults/main.yml
index 961aa081a..91656ff6b 100644
--- a/roles/matrix-postgres/defaults/main.yml
+++ b/roles/matrix-postgres/defaults/main.yml
@@ -30,4 +30,4 @@ matrix_postgres_container_extra_arguments: []
 # Takes an "<ip>:<port>" or "<port>" value (e.g. "127.0.0.1:5432"), or empty string to not expose.
 matrix_postgres_container_postgres_bind_port: ""
 
-matrix_postgres_tool_synapse_janitor: "https://raw.githubusercontent.com/xwiki-labs/synapse_scripts/0b3f035951932ceb396631de3fc701043b9723bc/synapse_janitor.sql"
+matrix_postgres_tool_synapse_janitor: "https://raw.githubusercontent.com/xwiki-labs/synapse_scripts/a9188ff175ae581610f92d58ea6eac9a114d854b/synapse_janitor.sql"

From 310aa685f94e0c65b960be4f11964f8981c8a77d Mon Sep 17 00:00:00 2001
From: Horvath Gergely <horvathg@hekate>
Date: Sun, 8 Mar 2020 00:24:00 +0100
Subject: [PATCH 36/59] refactor based on Slavi's requests

---
 group_vars/matrix_servers                     | 16 --------
 roles/matrix-base/defaults/main.yml           | 10 ++---
 roles/matrix-base/tasks/server_base/setup.yml |  2 +-
 roles/matrix-base/tasks/setup_matrix_base.yml |  7 ----
 .../defaults/main.yml                         |  2 +
 .../tasks/setup_install.yml                   | 35 +++++++++---------
 .../defaults/main.yml                         |  2 +
 .../tasks/setup_install.yml                   | 37 ++++++++++---------
 roles/matrix-coturn/defaults/main.yml         |  2 +
 roles/matrix-coturn/tasks/setup_coturn.yml    | 21 ++++++++---
 roles/matrix-mxisd/defaults/main.yml          |  2 +
 roles/matrix-mxisd/tasks/setup_mxisd.yml      | 27 +++++---------
 roles/matrix-riot-web/defaults/main.yml       |  2 +
 .../matrix-riot-web/tasks/setup_riot_web.yml  | 15 +++++---
 roles/matrix-synapse/defaults/main.yml        |  2 +
 roles/matrix-synapse/tasks/setup_synapse.yml  |  1 +
 .../tasks/synapse/setup_install.yml           | 10 ++---
 17 files changed, 94 insertions(+), 99 deletions(-)

diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers
index 51365d74f..5efde0c95 100755
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@@ -678,19 +678,3 @@ matrix_synapse_systemd_wanted_services_list: |
 # /matrix-synapse
 #
 ######################################################################
-
-
-
-######################################################################
-#
-# raspberry pi
-#
-######################################################################
-
-matrix_raspberry_pi: "false"
-
-######################################################################
-#
-# /raspberry pi
-#
-######################################################################
diff --git a/roles/matrix-base/defaults/main.yml b/roles/matrix-base/defaults/main.yml
index a9fd62242..a58e3bc42 100644
--- a/roles/matrix-base/defaults/main.yml
+++ b/roles/matrix-base/defaults/main.yml
@@ -26,13 +26,6 @@ matrix_base_data_path: "/matrix"
 matrix_base_data_path_mode: "750"
 
 matrix_static_files_base_path: "{{ matrix_base_data_path }}/static-files"
-matrix_docker_src_files_path: "{{ matrix_base_data_path }}/docker-src"
-matrix_docker_synapse_src_files_path: "{{ matrix_docker_src_files_path }}/synapse"
-matrix_docker_riot_web_src_files_path: "{{ matrix_docker_src_files_path }}/riot-web"
-matrix_docker_coturn_src_files_path: "{{ matrix_docker_src_files_path }}/coturn"
-matrix_docker_mxisd_src_files_path: "{{ matrix_docker_src_files_path }}/mxisd"
-matrix_docker_mautrix_facebook_src_files_path: "{{ matrix_docker_src_files_path }}/mautrix-facebook"
-matrix_docker_mautrix_hangouts_src_files_path: "{{ matrix_docker_src_files_path }}/mautrix-hangouts"
 
 matrix_homeserver_url: "https://{{ matrix_server_fqn_matrix }}"
 
@@ -73,3 +66,6 @@ run_setup: true
 run_self_check: true
 run_start: true
 run_stop: true
+
+# Raspberry pi depoly TODO: it should be identified based on the operating system
+matrix_raspberry_pi_deploy: false
\ No newline at end of file
diff --git a/roles/matrix-base/tasks/server_base/setup.yml b/roles/matrix-base/tasks/server_base/setup.yml
index bd52a0e74..1ce62158f 100644
--- a/roles/matrix-base/tasks/server_base/setup.yml
+++ b/roles/matrix-base/tasks/server_base/setup.yml
@@ -7,7 +7,7 @@
   when: (ansible_os_family == 'Debian') and (ansible_lsb.id != 'Raspbian') 
 
 - include_tasks: "{{ role_path }}/tasks/server_base/setup_raspbian.yml"
-  when: "matrix_raspberry_pi" 
+  when: "matrix_raspberry_pi_deploy" 
 
 - name: Ensure Docker is started and autoruns
   service:
diff --git a/roles/matrix-base/tasks/setup_matrix_base.yml b/roles/matrix-base/tasks/setup_matrix_base.yml
index 77665f6bb..b4aa92b9a 100644
--- a/roles/matrix-base/tasks/setup_matrix_base.yml
+++ b/roles/matrix-base/tasks/setup_matrix_base.yml
@@ -22,13 +22,6 @@
     group: "{{ matrix_user_username }}"
   with_items:
     - "{{ matrix_base_data_path }}"
-    - { src: "{{ matrix_docker_src_files_path }}", when: "{{ matrix_raspberry_pi }}" }
-    - { src: "{{ matrix_docker_synapse_src_files_path }}", when: "{{ matrix_raspberry_pi }}" }
-    - { src: "{{ matrix_docker_riot_web_src_files_path }}", when: "{{ matrix_raspberry_pi }}" }
-    - { src: "{{ matrix_docker_coturn_src_files_path }}", when: "{{ matrix_coturn_enabled }}"}
-    - { src: "{{ matrix_docker_mxisd_src_files_path }}", when: "{{ matrix_mxisd_enabled }}"}
-    - { src: "{{ matrix_docker_mautrix_facebook_src_files_path }}", when: "{{ matrix_mautrix_facebook_enabled }}"}
-    - { src: "{{ matrix_docker_mautrix_hangouts_src_files_path }}", when: "{{ matrix_mautrix_hangouts_enabled }}"}
 
 # `docker_network` doesn't work as expected when the given network
 # is a substring of a network that already exists.
diff --git a/roles/matrix-bridge-mautrix-facebook/defaults/main.yml b/roles/matrix-bridge-mautrix-facebook/defaults/main.yml
index bf57e9260..6503a2754 100644
--- a/roles/matrix-bridge-mautrix-facebook/defaults/main.yml
+++ b/roles/matrix-bridge-mautrix-facebook/defaults/main.yml
@@ -2,6 +2,7 @@
 # See: https://github.com/tulir/mautrix-facebook
 
 matrix_mautrix_facebook_enabled: true
+matrix_mautrix_facebook_self_build: false
 
 # See: https://mau.dev/tulir/mautrix-facebook/container_registry
 matrix_mautrix_facebook_docker_image: "dock.mau.dev/tulir/mautrix-facebook:latest"
@@ -10,6 +11,7 @@ matrix_mautrix_facebook_docker_image_force_pull: "{{ matrix_mautrix_facebook_doc
 matrix_mautrix_facebook_base_path: "{{ matrix_base_data_path }}/mautrix-facebook"
 matrix_mautrix_facebook_config_path: "{{ matrix_mautrix_facebook_base_path }}/config"
 matrix_mautrix_facebook_data_path: "{{ matrix_mautrix_facebook_base_path }}/data"
+matrix_docker_mautrix_facebook_src_files_path: "{{ matrix_mautrix_facebook_base_path }}/docker-src"
 
 matrix_mautrix_facebook_homeserver_address: 'http://matrix-synapse:8008'
 matrix_mautrix_facebook_homeserver_domain: '{{ matrix_domain }}'
diff --git a/roles/matrix-bridge-mautrix-facebook/tasks/setup_install.yml b/roles/matrix-bridge-mautrix-facebook/tasks/setup_install.yml
index a8c7cdf1a..7b83ae4ea 100644
--- a/roles/matrix-bridge-mautrix-facebook/tasks/setup_install.yml
+++ b/roles/matrix-bridge-mautrix-facebook/tasks/setup_install.yml
@@ -14,17 +14,30 @@
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_mautrix_facebook_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
     force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_mautrix_facebook_docker_image_force_pull }}"
-  when: matrix_mautrix_facebook_enabled|bool and not matrix_raspberry_pi
+  when: matrix_mautrix_facebook_enabled|bool and not matrix_mautrix_facebook_self_build
 
-- name: Ensure Mautrix Facebook repository is present on Raspberry pi
+- name: Ensure Mautrix Facebook paths exist
+  file:
+    path: "{{ item }}"
+    state: directory
+    mode: 0750
+    owner: "{{ matrix_user_username }}"
+    group: "{{ matrix_user_username }}"
+  with_items:
+    - "{{ matrix_mautrix_facebook_base_path }}"
+    - "{{ matrix_mautrix_facebook_config_path }}"
+    - "{{ matrix_mautrix_facebook_data_path }}"
+    - { src: "{{ matrix_docker_mautrix_facebook_src_files_path }}", when: "{{ matrix_mautrix_facebook_self_build }}" }
+
+- name: Ensure Mautrix Facebook repository is present on self-build
   git:
     repo: https://github.com/tulir/mautrix-facebook.git
     dest: "{{ matrix_docker_mautrix_facebook_src_files_path }}"
 #    version: "{{ matrix_coturn_docker_image.split(':')[1] }}"
     force: "yes"
-  when: "matrix_mautrix_facebook_enabled|bool and matrix_raspberry_pi"
+  when: "matrix_mautrix_facebook_enabled|bool and matrix_mautrix_facebook_self_build"
 
-- name: Ensure Mautrix Facebook Docker image is build (Raspberry pi)
+- name: Ensure Mautrix Facebook Docker image is build
   docker_image:
     name: "{{ matrix_mautrix_facebook_docker_image }}"
     source: build
@@ -32,19 +45,7 @@
       dockerfile: Dockerfile
       path: "{{ matrix_docker_mautrix_facebook_src_files_path }}"
       pull: yes
-  when: "matrix_mautrix_facebook_enabled|bool and matrix_raspberry_pi"
-
-- name: Ensure Mautrix Facebook paths exist
-  file:
-    path: "{{ item }}"
-    state: directory
-    mode: 0750
-    owner: "{{ matrix_user_username }}"
-    group: "{{ matrix_user_username }}"
-  with_items:
-    - "{{ matrix_mautrix_facebook_base_path }}"
-    - "{{ matrix_mautrix_facebook_config_path }}"
-    - "{{ matrix_mautrix_facebook_data_path }}"
+  when: "matrix_mautrix_facebook_enabled|bool and matrix_mautrix_facebook_self_build"
 
 - name: Check if an old database file already exists
   stat:
diff --git a/roles/matrix-bridge-mautrix-hangouts/defaults/main.yml b/roles/matrix-bridge-mautrix-hangouts/defaults/main.yml
index fdb2c6390..e136dd1ed 100644
--- a/roles/matrix-bridge-mautrix-hangouts/defaults/main.yml
+++ b/roles/matrix-bridge-mautrix-hangouts/defaults/main.yml
@@ -2,6 +2,7 @@
 # See: https://github.com/tulir/mautrix-hangouts
 
 matrix_mautrix_hangouts_enabled: true
+matrix_mautrix_hangouts_self_build: true
 
 # See: https://mau.dev/tulir/mautrix-hangouts/container_registry
 matrix_mautrix_hangouts_docker_image: "dock.mau.dev/tulir/mautrix-hangouts:latest"
@@ -10,6 +11,7 @@ matrix_mautrix_hangouts_docker_image_force_pull: "{{ matrix_mautrix_hangouts_doc
 matrix_mautrix_hangouts_base_path: "{{ matrix_base_data_path }}/mautrix-hangouts"
 matrix_mautrix_hangouts_config_path: "{{ matrix_mautrix_hangouts_base_path }}/config"
 matrix_mautrix_hangouts_data_path: "{{ matrix_mautrix_hangouts_base_path }}/data"
+matrix_docker_mautrix_hangouts_src_files_path: "{{ matrix_mautrix_hangouts_base_path }}/docker-src"
 
 matrix_mautrix_hangouts_public_endpoint: '/mautrix-hangouts'
 
diff --git a/roles/matrix-bridge-mautrix-hangouts/tasks/setup_install.yml b/roles/matrix-bridge-mautrix-hangouts/tasks/setup_install.yml
index 90206fd67..4a5c91038 100644
--- a/roles/matrix-bridge-mautrix-hangouts/tasks/setup_install.yml
+++ b/roles/matrix-bridge-mautrix-hangouts/tasks/setup_install.yml
@@ -14,16 +14,31 @@
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_mautrix_hangouts_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
     force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_mautrix_hangouts_docker_image_force_pull }}"
-  when: matrix_mautrix_hangouts_enabled|bool and not matrix_raspberry_pi
+  when: matrix_mautrix_hangouts_enabled|bool and not matrix_mautrix_hangouts_self_build
 
-- name: Ensure Mautrix Hangots repository is present on Raspberry pi
+- name: Ensure Mautrix Hangouts paths exist
+  file:
+    path: "{{ item }}"
+    state: directory
+    mode: 0750
+    owner: "{{ matrix_user_username }}"
+    group: "{{ matrix_user_username }}"
+  with_items:
+    - "{{ matrix_mautrix_hangouts_base_path }}"
+    - "{{ matrix_mautrix_hangouts_config_path }}"
+    - "{{ matrix_mautrix_hangouts_data_path }}"
+    - { src: "{{ matrix_docker_mautrix_hangouts_src_files_path }}", when: "{{ matrix_mautrix_hangouts_self_build }}" }
+
+  when: matrix_mautrix_hangouts_enabled|bool and not matrix_mautrix_hangouts_self_build
+
+- name: Ensure Mautrix Hangots repository is present on self build
   git:
     repo: https://github.com/tulir/mautrix-hangouts.git
     dest: "{{ matrix_docker_mautrix_hangouts_src_files_path }}"
     force: "yes"
-  when: "matrix_mautrix_hangouts_enabled|bool and matrix_raspberry_pi"
+  when: "matrix_mautrix_hangouts_enabled|bool and matrix_mautrix_hangouts_self_build"
 
-- name: Ensure Mautrix Hangouts Docker image is build (Raspberry pi)
+- name: Ensure Mautrix Hangouts Docker image is build
   docker_image:
     name: "{{ matrix_mautrix_hangouts_docker_image }}"
     source: build
@@ -31,19 +46,7 @@
       dockerfile: Dockerfile
       path: "{{ matrix_docker_mautrix_hangouts_src_files_path }}"
       pull: yes
-  when: "matrix_mautrix_hangouts_enabled|bool and matrix_raspberry_pi"
-
-- name: Ensure Mautrix Hangouts paths exist
-  file:
-    path: "{{ item }}"
-    state: directory
-    mode: 0750
-    owner: "{{ matrix_user_username }}"
-    group: "{{ matrix_user_username }}"
-  with_items:
-    - "{{ matrix_mautrix_hangouts_base_path }}"
-    - "{{ matrix_mautrix_hangouts_config_path }}"
-    - "{{ matrix_mautrix_hangouts_data_path }}"
+  when: "matrix_mautrix_hangouts_enabled|bool and matrix_mautrix_hangouts_self_build"
 
 - name: Check if an old database file already exists
   stat:
diff --git a/roles/matrix-coturn/defaults/main.yml b/roles/matrix-coturn/defaults/main.yml
index 4bcbb2231..c6a021845 100644
--- a/roles/matrix-coturn/defaults/main.yml
+++ b/roles/matrix-coturn/defaults/main.yml
@@ -1,4 +1,5 @@
 matrix_coturn_enabled: true
+matrix_coturn_self_build: false
 
 matrix_coturn_docker_image: "instrumentisto/coturn:4.5.1.1"
 matrix_coturn_docker_image_force_pull: "{{ matrix_coturn_docker_image.endswith(':latest') }}"
@@ -13,6 +14,7 @@ matrix_coturn_docker_image_force_pull: "{{ matrix_coturn_docker_image.endswith('
 matrix_coturn_docker_network: "matrix-coturn"
 
 matrix_coturn_base_path: "{{ matrix_base_data_path }}/coturn"
+matrix_docker_coturn_src_files_path: "{{ matrix_coturn_base_path }}/docker-src"
 matrix_coturn_config_path: "{{ matrix_coturn_base_path }}/turnserver.conf"
 
 # List of systemd services that matrix-coturn.service depends on
diff --git a/roles/matrix-coturn/tasks/setup_coturn.yml b/roles/matrix-coturn/tasks/setup_coturn.yml
index bdd7d774f..9a50859af 100644
--- a/roles/matrix-coturn/tasks/setup_coturn.yml
+++ b/roles/matrix-coturn/tasks/setup_coturn.yml
@@ -4,23 +4,34 @@
 # Tasks related to setting up Coturn
 #
 
+- name: Ensure Matrix Coturn path exists
+  file:
+    path: "{{ item }}"
+    state: directory
+    mode: 0750
+    owner: "{{ matrix_user_username }}"
+    group: "{{ matrix_user_username }}"
+  with_items:
+    - { src: "{{ matrix_docker_coturn_src_files_path }}", when: "{{ matrix_coturn_self_build }}"}
+  when: matrix_riot_web_enabled|bool
+
 - name: Ensure Coturn image is pulled
   docker_image:
     name: "{{ matrix_coturn_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_coturn_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
     force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_coturn_docker_image_force_pull }}"
-  when: matrix_coturn_enabled|bool and not matrix_raspberry_pi
+  when: matrix_coturn_enabled|bool and not matrix_coturn_self_build
 
-- name: Ensure Coturn repository is present on Raspberry pi
+- name: Ensure Coturn repository is present on self-build
   git:
     repo: https://github.com/instrumentisto/coturn-docker-image.git
     dest: "{{ matrix_docker_coturn_src_files_path }}"
     version: "{{ matrix_coturn_docker_image.split(':')[1] }}"
     force: "yes"
-  when: "matrix_coturn_enabled|bool and matrix_raspberry_pi"
+  when: "matrix_coturn_enabled|bool and matrix_coturn_self_build"
 
-- name: Ensure Coturn Docker image is build (Raspberry pi)
+- name: Ensure Coturn Docker image is build
   docker_image:
     name: "{{ matrix_coturn_docker_image }}"
     source: build
@@ -28,7 +39,7 @@
       dockerfile: Dockerfile
       path: "{{ matrix_docker_coturn_src_files_path }}"
       pull: yes
-  when: "matrix_coturn_enabled|bool and matrix_raspberry_pi"
+  when: "matrix_coturn_enabled|bool and matrix_coturn_self_build"
 
 - name: Ensure Coturn configuration path exists
   file:
diff --git a/roles/matrix-mxisd/defaults/main.yml b/roles/matrix-mxisd/defaults/main.yml
index 286839dab..b9bebb0b4 100644
--- a/roles/matrix-mxisd/defaults/main.yml
+++ b/roles/matrix-mxisd/defaults/main.yml
@@ -2,11 +2,13 @@
 # See: https://github.com/kamax-matrix/mxisd
 
 matrix_mxisd_enabled: true
+matrix_mxisd_self_build: false
 
 matrix_mxisd_docker_image: "kamax/mxisd:1.4.6"
 matrix_mxisd_docker_image_force_pull: "{{ matrix_mxisd_docker_image.endswith(':latest') }}"
 
 matrix_mxisd_base_path: "{{ matrix_base_data_path }}/mxisd"
+matrix_docker_mxisd_src_files_path: "{{ matrix_mxisd_base_path }}/docker-src"
 matrix_mxisd_config_path: "{{ matrix_mxisd_base_path }}/config"
 matrix_mxisd_data_path: "{{ matrix_mxisd_base_path }}/data"
 
diff --git a/roles/matrix-mxisd/tasks/setup_mxisd.yml b/roles/matrix-mxisd/tasks/setup_mxisd.yml
index b01327223..b01abef3a 100644
--- a/roles/matrix-mxisd/tasks/setup_mxisd.yml
+++ b/roles/matrix-mxisd/tasks/setup_mxisd.yml
@@ -14,6 +14,7 @@
   with_items:
     - "{{ matrix_mxisd_config_path }}"
     - "{{ matrix_mxisd_data_path }}"
+    - { src: "{{ matrix_docker_mxisd_src_files_path }}", when: "{{ matrix_mxisd_self_build }}"}
   when: matrix_mxisd_enabled|bool
 
 - name: Ensure mxisd image is pulled
@@ -22,39 +23,29 @@
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_mxisd_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
     force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_mxisd_docker_image_force_pull }}"
-  when: matrix_mxisd_enabled|bool and not matrix_raspberry_pi
+  when: matrix_mxisd_enabled|bool and not matrix_mxisd_self_build
 
-- name: Ensure gradel is installed on Raspberry pi for building
+- name: Ensure gradel is installed for self-building
   apt:
     name:
       - gradle
     state: present
     update_cache: yes    
-  when: "matrix_mxisd_enabled|bool and matrix_raspberry_pi"
+  when: "matrix_mxisd_enabled|bool and matrix_mxisd_self_build"
 
-- name: Ensure mxisd repository is present on Raspberry pi
+- name: Ensure mxisd repository is present on self-build
   git:
     repo: https://github.com/kamax-matrix/mxisd.git
     dest: "{{ matrix_docker_mxisd_src_files_path }}"
     version: "v{{ matrix_mxisd_docker_image.split(':')[1] }}"
     force: "yes"
-  when: "matrix_mxisd_enabled|bool and matrix_raspberry_pi"
-
-# - name: Ensure mxisd Docker image is build (Raspberry pi)
-#   docker_image:
-#     name: "{{ matrix_mxisd_docker_image }}"
-#     source: build
-#     build:
-#       dockerfile: Dockerfile
-#       path: "{{ matrix_docker_mxisd_src_files_path }}"
-#       pull: yes
-#   when: "matrix_mxisd_enabled|bool and matrix_raspberry_pi"
-
-- name: Ensure mxisd Docker image is build (Raspberry pi)
+  when: "matrix_mxisd_enabled|bool and matrix_mxisd_self_build"
+
+- name: Ensure mxisd Docker image is build
   shell: "./gradlew dockerBuild"
   args:
     chdir: "{{ matrix_docker_mxisd_src_files_path }}"
-  when: "matrix_mxisd_enabled|bool and matrix_raspberry_pi"
+  when: "matrix_mxisd_enabled|bool and matrix_mxisd_self_build"
 
 - name: Ensure mxisd config installed
   copy:
diff --git a/roles/matrix-riot-web/defaults/main.yml b/roles/matrix-riot-web/defaults/main.yml
index e707a61a3..0a37c965b 100644
--- a/roles/matrix-riot-web/defaults/main.yml
+++ b/roles/matrix-riot-web/defaults/main.yml
@@ -1,9 +1,11 @@
 matrix_riot_web_enabled: true
+matrix_riot_web_self_build: false
 
 matrix_riot_web_docker_image: "vectorim/riot-web:v1.5.12"
 matrix_riot_web_docker_image_force_pull: "{{ matrix_riot_web_docker_image.endswith(':latest') }}"
 
 matrix_riot_web_data_path: "{{ matrix_base_data_path }}/riot-web"
+matrix_docker_riot_web_src_files_path: "{{ matrix_riot_web_data_path }}/docker-src"
 
 # Controls whether the matrix-riot-web container exposes its HTTP port (tcp/8080 in the container).
 #
diff --git a/roles/matrix-riot-web/tasks/setup_riot_web.yml b/roles/matrix-riot-web/tasks/setup_riot_web.yml
index fcaaeeec4..ef0ec91d6 100644
--- a/roles/matrix-riot-web/tasks/setup_riot_web.yml
+++ b/roles/matrix-riot-web/tasks/setup_riot_web.yml
@@ -6,11 +6,14 @@
 
 - name: Ensure Matrix riot-web path exists
   file:
-    path: "{{ matrix_riot_web_data_path }}"
+    path: "{{ item }}"
     state: directory
     mode: 0750
     owner: "{{ matrix_user_username }}"
     group: "{{ matrix_user_username }}"
+  with_items:
+    - "{{ matrix_riot_web_data_path }}"
+    - { src: "{{ matrix_docker_riot_web_src_files_path }}", when: "{{ matrix_riot_web_self_build }}" }
   when: matrix_riot_web_enabled|bool
 
 - name: Ensure riot-web Docker image is pulled
@@ -19,17 +22,17 @@
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_riot_web_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
     force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_riot_web_docker_image_force_pull }}"
-  when: matrix_riot_web_enabled|bool and not matrix_raspberry_pi
+  when: matrix_riot_web_enabled|bool and not matrix_riot_web_self_build
 
-- name: Ensure Riot Web repository is present on Raspberry pi
+- name: Ensure Riot Web repository is present on self-build
   git:
     repo: https://github.com/vector-im/riot-web.git
     dest: "{{ matrix_docker_riot_web_src_files_path }}"
     version: "v{{ matrix_riot_web_docker_image.split(':')[1] }}"
     force: "yes"
-  when: "matrix_riot_web_enabled|bool and matrix_raspberry_pi"
+  when: "matrix_riot_web_enabled|bool and matrix_riot_web_self_build"
 
-- name: Ensure Riot Web Docker image is build (Raspberry pi)
+- name: Ensure Riot Web Docker image is build
   docker_image:
     name: "{{ matrix_riot_web_docker_image }}"
     source: build
@@ -37,7 +40,7 @@
       dockerfile: Dockerfile
       path: "{{ matrix_docker_riot_web_src_files_path }}"
       pull: yes
-  when: "matrix_riot_web_enabled|bool and matrix_raspberry_pi"
+  when: "matrix_riot_web_enabled|bool and matrix_self_build"
 
 - name: Ensure Matrix riot-web configuration installed
   copy:
diff --git a/roles/matrix-synapse/defaults/main.yml b/roles/matrix-synapse/defaults/main.yml
index 05ad9126a..309d4396f 100644
--- a/roles/matrix-synapse/defaults/main.yml
+++ b/roles/matrix-synapse/defaults/main.yml
@@ -2,11 +2,13 @@
 # See: https://github.com/matrix-org/synapse
 
 matrix_synapse_enabled: true
+matrix_synapse_self_build: false
 
 matrix_synapse_docker_image: "matrixdotorg/synapse:v1.11.1"
 matrix_synapse_docker_image_force_pull: "{{ matrix_synapse_docker_image.endswith(':latest') }}"
 
 matrix_synapse_base_path: "{{ matrix_base_data_path }}/synapse"
+matrix_docker_synapse_src_files_path: "{{ matrix_synapse_base_path }}/docker-src"
 matrix_synapse_config_dir_path: "{{ matrix_synapse_base_path }}/config"
 matrix_synapse_run_path: "{{ matrix_synapse_base_path }}/run"
 matrix_synapse_storage_path: "{{ matrix_synapse_base_path }}/storage"
diff --git a/roles/matrix-synapse/tasks/setup_synapse.yml b/roles/matrix-synapse/tasks/setup_synapse.yml
index b565a4d2d..c5d6beef2 100644
--- a/roles/matrix-synapse/tasks/setup_synapse.yml
+++ b/roles/matrix-synapse/tasks/setup_synapse.yml
@@ -11,6 +11,7 @@
     - "{{ matrix_synapse_config_dir_path }}"
     - "{{ matrix_synapse_run_path }}"
     - "{{ matrix_synapse_ext_path }}"
+    - { src: "{{ matrix_docker_synapse_src_files_path }}", when: "{{ matrix_synapse_self_build }}" }
     # We handle matrix_synapse_media_store_path elsewhere (in ./synapse/setup_install.yml),
     # because if it's using Goofys and it's already mounted (from before),
     # trying to chown/chmod it here will cause trouble.
diff --git a/roles/matrix-synapse/tasks/synapse/setup_install.yml b/roles/matrix-synapse/tasks/synapse/setup_install.yml
index 33f04a288..2188b1bdd 100644
--- a/roles/matrix-synapse/tasks/synapse/setup_install.yml
+++ b/roles/matrix-synapse/tasks/synapse/setup_install.yml
@@ -18,15 +18,15 @@
     group: "{{ matrix_user_username }}"
   when: "not local_path_media_store_stat.failed and not local_path_media_store_stat.stat.exists"
 
-- name: Ensure Synapse repository is present on Raspberry pi
+- name: Ensure Synapse repository is present on self-build
   git:
     repo: https://github.com/matrix-org/synapse.git
     dest: "{{ matrix_docker_synapse_src_files_path }}"
     version: "{{ matrix_synapse_docker_image.split(':')[1] }}"
     force: "yes"
-  when: "matrix_raspberry_pi"
+  when: "matrix_synapse_self_build"
 
-- name: Ensure Synapse Docker image is build (Raspberry pi)
+- name: Ensure Synapse Docker image is build
   docker_image:
     name: "{{ matrix_synapse_docker_image }}"
     source: build
@@ -34,7 +34,7 @@
       dockerfile: docker/Dockerfile
       path: "{{ matrix_docker_synapse_src_files_path }}"
       pull: yes
-  when: "matrix_raspberry_pi"
+  when: "matrix_synapse_self_build"
 
 - name: Ensure Synapse Docker image is pulled
   docker_image:
@@ -42,7 +42,7 @@
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_synapse_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
     force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_synapse_docker_image_force_pull }}"
-  when: "not matrix_raspberry_pi"
+  when: "not matrix_synapse_self_build"
 
 - name: Check if a Synapse signing key exists
   stat:

From a5d94eec0b62f02cf31c1537ed1e9bfb0024903c Mon Sep 17 00:00:00 2001
From: Horvath Gergely <horvathg@hekate>
Date: Sun, 8 Mar 2020 00:28:14 +0100
Subject: [PATCH 37/59] refactor variable names

---
 roles/matrix-bridge-mautrix-facebook/defaults/main.yml      | 2 +-
 .../matrix-bridge-mautrix-facebook/tasks/setup_install.yml  | 6 +++---
 roles/matrix-bridge-mautrix-hangouts/defaults/main.yml      | 2 +-
 .../matrix-bridge-mautrix-hangouts/tasks/setup_install.yml  | 6 +++---
 roles/matrix-coturn/defaults/main.yml                       | 2 +-
 roles/matrix-coturn/tasks/setup_coturn.yml                  | 6 +++---
 roles/matrix-mxisd/defaults/main.yml                        | 2 +-
 roles/matrix-mxisd/tasks/setup_mxisd.yml                    | 6 +++---
 roles/matrix-riot-web/defaults/main.yml                     | 2 +-
 roles/matrix-riot-web/tasks/setup_riot_web.yml              | 6 +++---
 roles/matrix-synapse/defaults/main.yml                      | 2 +-
 roles/matrix-synapse/tasks/setup_synapse.yml                | 2 +-
 roles/matrix-synapse/tasks/synapse/setup_install.yml        | 4 ++--
 13 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/roles/matrix-bridge-mautrix-facebook/defaults/main.yml b/roles/matrix-bridge-mautrix-facebook/defaults/main.yml
index 6503a2754..93a3134b9 100644
--- a/roles/matrix-bridge-mautrix-facebook/defaults/main.yml
+++ b/roles/matrix-bridge-mautrix-facebook/defaults/main.yml
@@ -11,7 +11,7 @@ matrix_mautrix_facebook_docker_image_force_pull: "{{ matrix_mautrix_facebook_doc
 matrix_mautrix_facebook_base_path: "{{ matrix_base_data_path }}/mautrix-facebook"
 matrix_mautrix_facebook_config_path: "{{ matrix_mautrix_facebook_base_path }}/config"
 matrix_mautrix_facebook_data_path: "{{ matrix_mautrix_facebook_base_path }}/data"
-matrix_docker_mautrix_facebook_src_files_path: "{{ matrix_mautrix_facebook_base_path }}/docker-src"
+matrix_mautrix_facebook_docker_src_files_path: "{{ matrix_mautrix_facebook_base_path }}/docker-src"
 
 matrix_mautrix_facebook_homeserver_address: 'http://matrix-synapse:8008'
 matrix_mautrix_facebook_homeserver_domain: '{{ matrix_domain }}'
diff --git a/roles/matrix-bridge-mautrix-facebook/tasks/setup_install.yml b/roles/matrix-bridge-mautrix-facebook/tasks/setup_install.yml
index 7b83ae4ea..1088f0b43 100644
--- a/roles/matrix-bridge-mautrix-facebook/tasks/setup_install.yml
+++ b/roles/matrix-bridge-mautrix-facebook/tasks/setup_install.yml
@@ -27,12 +27,12 @@
     - "{{ matrix_mautrix_facebook_base_path }}"
     - "{{ matrix_mautrix_facebook_config_path }}"
     - "{{ matrix_mautrix_facebook_data_path }}"
-    - { src: "{{ matrix_docker_mautrix_facebook_src_files_path }}", when: "{{ matrix_mautrix_facebook_self_build }}" }
+    - { src: "{{ matrix_mautrix_facebook_docker_src_files_path }}", when: "{{ matrix_mautrix_facebook_self_build }}" }
 
 - name: Ensure Mautrix Facebook repository is present on self-build
   git:
     repo: https://github.com/tulir/mautrix-facebook.git
-    dest: "{{ matrix_docker_mautrix_facebook_src_files_path }}"
+    dest: "{{ matrix_mautrix_facebook_docker_src_files_path }}"
 #    version: "{{ matrix_coturn_docker_image.split(':')[1] }}"
     force: "yes"
   when: "matrix_mautrix_facebook_enabled|bool and matrix_mautrix_facebook_self_build"
@@ -43,7 +43,7 @@
     source: build
     build:
       dockerfile: Dockerfile
-      path: "{{ matrix_docker_mautrix_facebook_src_files_path }}"
+      path: "{{ matrix_mautrix_facebook_docker_src_files_path }}"
       pull: yes
   when: "matrix_mautrix_facebook_enabled|bool and matrix_mautrix_facebook_self_build"
 
diff --git a/roles/matrix-bridge-mautrix-hangouts/defaults/main.yml b/roles/matrix-bridge-mautrix-hangouts/defaults/main.yml
index e136dd1ed..0f3b14c5a 100644
--- a/roles/matrix-bridge-mautrix-hangouts/defaults/main.yml
+++ b/roles/matrix-bridge-mautrix-hangouts/defaults/main.yml
@@ -11,7 +11,7 @@ matrix_mautrix_hangouts_docker_image_force_pull: "{{ matrix_mautrix_hangouts_doc
 matrix_mautrix_hangouts_base_path: "{{ matrix_base_data_path }}/mautrix-hangouts"
 matrix_mautrix_hangouts_config_path: "{{ matrix_mautrix_hangouts_base_path }}/config"
 matrix_mautrix_hangouts_data_path: "{{ matrix_mautrix_hangouts_base_path }}/data"
-matrix_docker_mautrix_hangouts_src_files_path: "{{ matrix_mautrix_hangouts_base_path }}/docker-src"
+matrix_mautrix_hangouts_docker_src_files_path: "{{ matrix_mautrix_hangouts_base_path }}/docker-src"
 
 matrix_mautrix_hangouts_public_endpoint: '/mautrix-hangouts'
 
diff --git a/roles/matrix-bridge-mautrix-hangouts/tasks/setup_install.yml b/roles/matrix-bridge-mautrix-hangouts/tasks/setup_install.yml
index 4a5c91038..e18778b2d 100644
--- a/roles/matrix-bridge-mautrix-hangouts/tasks/setup_install.yml
+++ b/roles/matrix-bridge-mautrix-hangouts/tasks/setup_install.yml
@@ -27,14 +27,14 @@
     - "{{ matrix_mautrix_hangouts_base_path }}"
     - "{{ matrix_mautrix_hangouts_config_path }}"
     - "{{ matrix_mautrix_hangouts_data_path }}"
-    - { src: "{{ matrix_docker_mautrix_hangouts_src_files_path }}", when: "{{ matrix_mautrix_hangouts_self_build }}" }
+    - { src: "{{ matrix_mautrix_hangouts_docker_src_files_path }}", when: "{{ matrix_mautrix_hangouts_self_build }}" }
 
   when: matrix_mautrix_hangouts_enabled|bool and not matrix_mautrix_hangouts_self_build
 
 - name: Ensure Mautrix Hangots repository is present on self build
   git:
     repo: https://github.com/tulir/mautrix-hangouts.git
-    dest: "{{ matrix_docker_mautrix_hangouts_src_files_path }}"
+    dest: "{{ matrix_mautrix_hangouts_docker_src_files_path }}"
     force: "yes"
   when: "matrix_mautrix_hangouts_enabled|bool and matrix_mautrix_hangouts_self_build"
 
@@ -44,7 +44,7 @@
     source: build
     build:
       dockerfile: Dockerfile
-      path: "{{ matrix_docker_mautrix_hangouts_src_files_path }}"
+      path: "{{ matrix_mautrix_hangouts_docker_src_files_path }}"
       pull: yes
   when: "matrix_mautrix_hangouts_enabled|bool and matrix_mautrix_hangouts_self_build"
 
diff --git a/roles/matrix-coturn/defaults/main.yml b/roles/matrix-coturn/defaults/main.yml
index c6a021845..a8b71bcbd 100644
--- a/roles/matrix-coturn/defaults/main.yml
+++ b/roles/matrix-coturn/defaults/main.yml
@@ -14,7 +14,7 @@ matrix_coturn_docker_image_force_pull: "{{ matrix_coturn_docker_image.endswith('
 matrix_coturn_docker_network: "matrix-coturn"
 
 matrix_coturn_base_path: "{{ matrix_base_data_path }}/coturn"
-matrix_docker_coturn_src_files_path: "{{ matrix_coturn_base_path }}/docker-src"
+matrix_coturn_docker_src_files_path: "{{ matrix_coturn_base_path }}/docker-src"
 matrix_coturn_config_path: "{{ matrix_coturn_base_path }}/turnserver.conf"
 
 # List of systemd services that matrix-coturn.service depends on
diff --git a/roles/matrix-coturn/tasks/setup_coturn.yml b/roles/matrix-coturn/tasks/setup_coturn.yml
index 9a50859af..ec7a452e5 100644
--- a/roles/matrix-coturn/tasks/setup_coturn.yml
+++ b/roles/matrix-coturn/tasks/setup_coturn.yml
@@ -12,7 +12,7 @@
     owner: "{{ matrix_user_username }}"
     group: "{{ matrix_user_username }}"
   with_items:
-    - { src: "{{ matrix_docker_coturn_src_files_path }}", when: "{{ matrix_coturn_self_build }}"}
+    - { src: "{{ matrix_coturn_docker_src_files_path }}", when: "{{ matrix_coturn_self_build }}"}
   when: matrix_riot_web_enabled|bool
 
 - name: Ensure Coturn image is pulled
@@ -26,7 +26,7 @@
 - name: Ensure Coturn repository is present on self-build
   git:
     repo: https://github.com/instrumentisto/coturn-docker-image.git
-    dest: "{{ matrix_docker_coturn_src_files_path }}"
+    dest: "{{ matrix_coturn_docker_src_files_path }}"
     version: "{{ matrix_coturn_docker_image.split(':')[1] }}"
     force: "yes"
   when: "matrix_coturn_enabled|bool and matrix_coturn_self_build"
@@ -37,7 +37,7 @@
     source: build
     build:
       dockerfile: Dockerfile
-      path: "{{ matrix_docker_coturn_src_files_path }}"
+      path: "{{ matrix_coturn_docker_src_files_path }}"
       pull: yes
   when: "matrix_coturn_enabled|bool and matrix_coturn_self_build"
 
diff --git a/roles/matrix-mxisd/defaults/main.yml b/roles/matrix-mxisd/defaults/main.yml
index b9bebb0b4..b3a921bbf 100644
--- a/roles/matrix-mxisd/defaults/main.yml
+++ b/roles/matrix-mxisd/defaults/main.yml
@@ -8,7 +8,7 @@ matrix_mxisd_docker_image: "kamax/mxisd:1.4.6"
 matrix_mxisd_docker_image_force_pull: "{{ matrix_mxisd_docker_image.endswith(':latest') }}"
 
 matrix_mxisd_base_path: "{{ matrix_base_data_path }}/mxisd"
-matrix_docker_mxisd_src_files_path: "{{ matrix_mxisd_base_path }}/docker-src"
+matrix_mxisd_docker_src_files_path: "{{ matrix_mxisd_base_path }}/docker-src"
 matrix_mxisd_config_path: "{{ matrix_mxisd_base_path }}/config"
 matrix_mxisd_data_path: "{{ matrix_mxisd_base_path }}/data"
 
diff --git a/roles/matrix-mxisd/tasks/setup_mxisd.yml b/roles/matrix-mxisd/tasks/setup_mxisd.yml
index b01abef3a..92b7163b9 100644
--- a/roles/matrix-mxisd/tasks/setup_mxisd.yml
+++ b/roles/matrix-mxisd/tasks/setup_mxisd.yml
@@ -14,7 +14,7 @@
   with_items:
     - "{{ matrix_mxisd_config_path }}"
     - "{{ matrix_mxisd_data_path }}"
-    - { src: "{{ matrix_docker_mxisd_src_files_path }}", when: "{{ matrix_mxisd_self_build }}"}
+    - { src: "{{ matrix_mxisd_docker_src_files_path }}", when: "{{ matrix_mxisd_self_build }}"}
   when: matrix_mxisd_enabled|bool
 
 - name: Ensure mxisd image is pulled
@@ -36,7 +36,7 @@
 - name: Ensure mxisd repository is present on self-build
   git:
     repo: https://github.com/kamax-matrix/mxisd.git
-    dest: "{{ matrix_docker_mxisd_src_files_path }}"
+    dest: "{{ matrix_mxisd_docker_src_files_path }}"
     version: "v{{ matrix_mxisd_docker_image.split(':')[1] }}"
     force: "yes"
   when: "matrix_mxisd_enabled|bool and matrix_mxisd_self_build"
@@ -44,7 +44,7 @@
 - name: Ensure mxisd Docker image is build
   shell: "./gradlew dockerBuild"
   args:
-    chdir: "{{ matrix_docker_mxisd_src_files_path }}"
+    chdir: "{{ matrix_mxisd_docker_src_files_path }}"
   when: "matrix_mxisd_enabled|bool and matrix_mxisd_self_build"
 
 - name: Ensure mxisd config installed
diff --git a/roles/matrix-riot-web/defaults/main.yml b/roles/matrix-riot-web/defaults/main.yml
index 0a37c965b..bdbce0f30 100644
--- a/roles/matrix-riot-web/defaults/main.yml
+++ b/roles/matrix-riot-web/defaults/main.yml
@@ -5,7 +5,7 @@ matrix_riot_web_docker_image: "vectorim/riot-web:v1.5.12"
 matrix_riot_web_docker_image_force_pull: "{{ matrix_riot_web_docker_image.endswith(':latest') }}"
 
 matrix_riot_web_data_path: "{{ matrix_base_data_path }}/riot-web"
-matrix_docker_riot_web_src_files_path: "{{ matrix_riot_web_data_path }}/docker-src"
+matrix_riot_web_docker_src_files_path: "{{ matrix_riot_web_data_path }}/docker-src"
 
 # Controls whether the matrix-riot-web container exposes its HTTP port (tcp/8080 in the container).
 #
diff --git a/roles/matrix-riot-web/tasks/setup_riot_web.yml b/roles/matrix-riot-web/tasks/setup_riot_web.yml
index ef0ec91d6..9161c8177 100644
--- a/roles/matrix-riot-web/tasks/setup_riot_web.yml
+++ b/roles/matrix-riot-web/tasks/setup_riot_web.yml
@@ -13,7 +13,7 @@
     group: "{{ matrix_user_username }}"
   with_items:
     - "{{ matrix_riot_web_data_path }}"
-    - { src: "{{ matrix_docker_riot_web_src_files_path }}", when: "{{ matrix_riot_web_self_build }}" }
+    - { src: "{{ matrix_riot_web_docker_src_files_path }}", when: "{{ matrix_riot_web_self_build }}" }
   when: matrix_riot_web_enabled|bool
 
 - name: Ensure riot-web Docker image is pulled
@@ -27,7 +27,7 @@
 - name: Ensure Riot Web repository is present on self-build
   git:
     repo: https://github.com/vector-im/riot-web.git
-    dest: "{{ matrix_docker_riot_web_src_files_path }}"
+    dest: "{{ matrix_riot_web_docker_src_files_path }}"
     version: "v{{ matrix_riot_web_docker_image.split(':')[1] }}"
     force: "yes"
   when: "matrix_riot_web_enabled|bool and matrix_riot_web_self_build"
@@ -38,7 +38,7 @@
     source: build
     build:
       dockerfile: Dockerfile
-      path: "{{ matrix_docker_riot_web_src_files_path }}"
+      path: "{{ matrix_riot_web_docker_src_files_path }}"
       pull: yes
   when: "matrix_riot_web_enabled|bool and matrix_self_build"
 
diff --git a/roles/matrix-synapse/defaults/main.yml b/roles/matrix-synapse/defaults/main.yml
index 309d4396f..1f0d49d81 100644
--- a/roles/matrix-synapse/defaults/main.yml
+++ b/roles/matrix-synapse/defaults/main.yml
@@ -8,7 +8,7 @@ matrix_synapse_docker_image: "matrixdotorg/synapse:v1.11.1"
 matrix_synapse_docker_image_force_pull: "{{ matrix_synapse_docker_image.endswith(':latest') }}"
 
 matrix_synapse_base_path: "{{ matrix_base_data_path }}/synapse"
-matrix_docker_synapse_src_files_path: "{{ matrix_synapse_base_path }}/docker-src"
+matrix_synapse_docker_src_files_path: "{{ matrix_synapse_base_path }}/docker-src"
 matrix_synapse_config_dir_path: "{{ matrix_synapse_base_path }}/config"
 matrix_synapse_run_path: "{{ matrix_synapse_base_path }}/run"
 matrix_synapse_storage_path: "{{ matrix_synapse_base_path }}/storage"
diff --git a/roles/matrix-synapse/tasks/setup_synapse.yml b/roles/matrix-synapse/tasks/setup_synapse.yml
index c5d6beef2..0ce851c7e 100644
--- a/roles/matrix-synapse/tasks/setup_synapse.yml
+++ b/roles/matrix-synapse/tasks/setup_synapse.yml
@@ -11,7 +11,7 @@
     - "{{ matrix_synapse_config_dir_path }}"
     - "{{ matrix_synapse_run_path }}"
     - "{{ matrix_synapse_ext_path }}"
-    - { src: "{{ matrix_docker_synapse_src_files_path }}", when: "{{ matrix_synapse_self_build }}" }
+    - { src: "{{ matrix_synapse_docker_src_files_path }}", when: "{{ matrix_synapse_self_build }}" }
     # We handle matrix_synapse_media_store_path elsewhere (in ./synapse/setup_install.yml),
     # because if it's using Goofys and it's already mounted (from before),
     # trying to chown/chmod it here will cause trouble.
diff --git a/roles/matrix-synapse/tasks/synapse/setup_install.yml b/roles/matrix-synapse/tasks/synapse/setup_install.yml
index 2188b1bdd..481429a40 100644
--- a/roles/matrix-synapse/tasks/synapse/setup_install.yml
+++ b/roles/matrix-synapse/tasks/synapse/setup_install.yml
@@ -21,7 +21,7 @@
 - name: Ensure Synapse repository is present on self-build
   git:
     repo: https://github.com/matrix-org/synapse.git
-    dest: "{{ matrix_docker_synapse_src_files_path }}"
+    dest: "{{ matrix_synapse_docker_src_files_path }}"
     version: "{{ matrix_synapse_docker_image.split(':')[1] }}"
     force: "yes"
   when: "matrix_synapse_self_build"
@@ -32,7 +32,7 @@
     source: build
     build:
       dockerfile: docker/Dockerfile
-      path: "{{ matrix_docker_synapse_src_files_path }}"
+      path: "{{ matrix_synapse_docker_src_files_path }}"
       pull: yes
   when: "matrix_synapse_self_build"
 

From 6232a81caf2d9c72394306ea6f2c6d638770b6f2 Mon Sep 17 00:00:00 2001
From: Horvath Gergely <horvathg@hekate>
Date: Sun, 8 Mar 2020 19:04:41 +0100
Subject: [PATCH 38/59] check if target distro is Raspbian and install docker
 accordingly

---
 roles/matrix-base/defaults/main.yml           | 3 ---
 roles/matrix-base/tasks/server_base/setup.yml | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/roles/matrix-base/defaults/main.yml b/roles/matrix-base/defaults/main.yml
index a58e3bc42..b4fef1dd7 100644
--- a/roles/matrix-base/defaults/main.yml
+++ b/roles/matrix-base/defaults/main.yml
@@ -66,6 +66,3 @@ run_setup: true
 run_self_check: true
 run_start: true
 run_stop: true
-
-# Raspberry pi depoly TODO: it should be identified based on the operating system
-matrix_raspberry_pi_deploy: false
\ No newline at end of file
diff --git a/roles/matrix-base/tasks/server_base/setup.yml b/roles/matrix-base/tasks/server_base/setup.yml
index 1ce62158f..70b2e4fcc 100644
--- a/roles/matrix-base/tasks/server_base/setup.yml
+++ b/roles/matrix-base/tasks/server_base/setup.yml
@@ -7,7 +7,7 @@
   when: (ansible_os_family == 'Debian') and (ansible_lsb.id != 'Raspbian') 
 
 - include_tasks: "{{ role_path }}/tasks/server_base/setup_raspbian.yml"
-  when: "matrix_raspberry_pi_deploy" 
+  when: (ansible_os_family == 'Debian') and (ansible_lsb.id == 'Raspbian') 
 
 - name: Ensure Docker is started and autoruns
   service:

From 3c8535c3bce0a99badd0c6efa858686445448a2a Mon Sep 17 00:00:00 2001
From: Horvath Gergely <horvathg@hekate>
Date: Sun, 8 Mar 2020 19:17:10 +0100
Subject: [PATCH 39/59] check ansible version for self-building in every role

---
 roles/matrix-base/tasks/sanity_check.yml            | 7 -------
 roles/matrix-bridge-mautrix-facebook/tasks/init.yml | 7 +++++++
 roles/matrix-bridge-mautrix-hangouts/tasks/init.yml | 7 +++++++
 roles/matrix-coturn/tasks/init.yml                  | 7 +++++++
 roles/matrix-mxisd/tasks/init.yml                   | 7 +++++++
 roles/matrix-riot-web/tasks/init.yml                | 7 +++++++
 roles/matrix-synapse/tasks/init.yml                 | 7 +++++++
 7 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/roles/matrix-base/tasks/sanity_check.yml b/roles/matrix-base/tasks/sanity_check.yml
index a0a92a227..b2d8c249e 100644
--- a/roles/matrix-base/tasks/sanity_check.yml
+++ b/roles/matrix-base/tasks/sanity_check.yml
@@ -44,10 +44,3 @@
     - "{{ matrix_server_fqn_matrix }}"
     - "{{ matrix_server_fqn_riot }}"
   when: "item != item|lower"
-
-# ansible lower than 2.8, does not support docker_image build parameters
-# for Raspberry pi it is explicitly needed, so we rather fail here
-- name: Fail if running on Ansible lower than 2.8 and targeting Raspberry pi
-  fail:
-    msg: "To target Raspberry pi, you should usa ansible 2.8 or higher. E.g. pip contains such packages."
-  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_raspberry_pi"
diff --git a/roles/matrix-bridge-mautrix-facebook/tasks/init.yml b/roles/matrix-bridge-mautrix-facebook/tasks/init.yml
index 92f978672..85bb3838d 100644
--- a/roles/matrix-bridge-mautrix-facebook/tasks/init.yml
+++ b/roles/matrix-bridge-mautrix-facebook/tasks/init.yml
@@ -14,3 +14,10 @@
       +
       {{ ["/matrix-mautrix-facebook-registration.yaml"] }}
   when: matrix_mautrix_facebook_enabled|bool
+
+# ansible lower than 2.8, does not support docker_image build parameters
+# for self buildig it is explicitly needed, so we rather fail here
+- name: Fail if running on Ansible lower than 2.8 and trying self building
+  fail:
+    msg: "To self build Mautrix Facebook image, you should usa ansible 2.8 or higher. E.g. pip contains such packages."
+  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_mautrix_facebook_self_build"
\ No newline at end of file
diff --git a/roles/matrix-bridge-mautrix-hangouts/tasks/init.yml b/roles/matrix-bridge-mautrix-hangouts/tasks/init.yml
index e4f48afc8..b276a1f65 100644
--- a/roles/matrix-bridge-mautrix-hangouts/tasks/init.yml
+++ b/roles/matrix-bridge-mautrix-hangouts/tasks/init.yml
@@ -60,3 +60,10 @@
       URL endpoint to the matrix-mautrix-hangouts container.
       You can expose the container's port using the `matrix_mautrix_hangouts_container_http_host_bind_port` variable.
   when: "matrix_mautrix_hangouts_enabled|bool and (matrix_nginx_proxy_enabled is not defined or matrix_nginx_proxy_enabled|bool == false)"
+
+# ansible lower than 2.8, does not support docker_image build parameters
+# for self buildig it is explicitly needed, so we rather fail here
+- name: Fail if running on Ansible lower than 2.8 and trying self building
+  fail:
+    msg: "To self build Mautrix Hangouts image, you should usa ansible 2.8 or higher. E.g. pip contains such packages."
+  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_mautrix_hangouts_self_build"
diff --git a/roles/matrix-coturn/tasks/init.yml b/roles/matrix-coturn/tasks/init.yml
index 603b536ab..9b97ce6a0 100644
--- a/roles/matrix-coturn/tasks/init.yml
+++ b/roles/matrix-coturn/tasks/init.yml
@@ -1,3 +1,10 @@
 - set_fact:
     matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-coturn'] }}"
   when: matrix_coturn_enabled|bool
+
+# ansible lower than 2.8, does not support docker_image build parameters
+# for self buildig it is explicitly needed, so we rather fail here
+- name: Fail if running on Ansible lower than 2.8 and trying self building
+  fail:
+    msg: "To self build Coturn image, you should usa ansible 2.8 or higher. E.g. pip contains such packages."
+  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_coturn_self_build"
diff --git a/roles/matrix-mxisd/tasks/init.yml b/roles/matrix-mxisd/tasks/init.yml
index 94543b355..dcae446e2 100644
--- a/roles/matrix-mxisd/tasks/init.yml
+++ b/roles/matrix-mxisd/tasks/init.yml
@@ -1,3 +1,10 @@
 - set_fact:
     matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-mxisd'] }}"
   when: matrix_mxisd_enabled|bool
+
+# ansible lower than 2.8, does not support docker_image build parameters
+# for self buildig it is explicitly needed, so we rather fail here
+- name: Fail if running on Ansible lower than 2.8 and trying self building
+  fail:
+    msg: "To self build Mxisd image, you should usa ansible 2.8 or higher. E.g. pip contains such packages."
+  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_mxisd_self_build"
diff --git a/roles/matrix-riot-web/tasks/init.yml b/roles/matrix-riot-web/tasks/init.yml
index 52c096eea..4fc4e6580 100644
--- a/roles/matrix-riot-web/tasks/init.yml
+++ b/roles/matrix-riot-web/tasks/init.yml
@@ -1,3 +1,10 @@
 - set_fact:
     matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-riot-web'] }}"
   when: matrix_riot_web_enabled|bool
+
+# ansible lower than 2.8, does not support docker_image build parameters
+# for self buildig it is explicitly needed, so we rather fail here
+- name: Fail if running on Ansible lower than 2.8 and trying self building
+  fail:
+    msg: "To self build Riot Web image, you should usa ansible 2.8 or higher. E.g. pip contains such packages."
+  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_riot_web_self_build"
diff --git a/roles/matrix-synapse/tasks/init.yml b/roles/matrix-synapse/tasks/init.yml
index d5f648623..b91c42cb1 100644
--- a/roles/matrix-synapse/tasks/init.yml
+++ b/roles/matrix-synapse/tasks/init.yml
@@ -5,3 +5,10 @@
 - set_fact:
     matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-goofys'] }}"
   when: matrix_s3_media_store_enabled|bool
+
+# ansible lower than 2.8, does not support docker_image build parameters
+# for self buildig it is explicitly needed, so we rather fail here
+- name: Fail if running on Ansible lower than 2.8 and trying self building
+  fail:
+    msg: "To self build Synapse image, you should usa ansible 2.8 or higher. E.g. pip contains such packages."
+  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_synapse_self_build"

From a164fe485e03a36065cdf7809f67631ba6c20f8e Mon Sep 17 00:00:00 2001
From: Horvath Gergely <horvathg@hekate>
Date: Sat, 14 Mar 2020 19:14:39 +0100
Subject: [PATCH 40/59] fix wrong variable name

---
 roles/matrix-riot-web/tasks/setup_riot_web.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/matrix-riot-web/tasks/setup_riot_web.yml b/roles/matrix-riot-web/tasks/setup_riot_web.yml
index 9161c8177..2216a0ffa 100644
--- a/roles/matrix-riot-web/tasks/setup_riot_web.yml
+++ b/roles/matrix-riot-web/tasks/setup_riot_web.yml
@@ -40,7 +40,7 @@
       dockerfile: Dockerfile
       path: "{{ matrix_riot_web_docker_src_files_path }}"
       pull: yes
-  when: "matrix_riot_web_enabled|bool and matrix_self_build"
+  when: "matrix_riot_web_enabled|bool and matrix_riot_web_self_build"
 
 - name: Ensure Matrix riot-web configuration installed
   copy:

From 2d537484d5c40d6ec93dbe2a12d1edc806f79b89 Mon Sep 17 00:00:00 2001
From: Horvath Gergely <horvathg@hekate>
Date: Sat, 14 Mar 2020 19:16:29 +0100
Subject: [PATCH 41/59] introduce  variable

---
 roles/matrix-base/defaults/main.yml                    | 4 ++++
 roles/matrix-bridge-mautrix-hangouts/defaults/main.yml | 2 +-
 roles/matrix-coturn/defaults/main.yml                  | 2 +-
 roles/matrix-mxisd/defaults/main.yml                   | 2 +-
 roles/matrix-riot-web/defaults/main.yml                | 2 +-
 roles/matrix-synapse/defaults/main.yml                 | 2 +-
 6 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/roles/matrix-base/defaults/main.yml b/roles/matrix-base/defaults/main.yml
index b4fef1dd7..c2a81c294 100644
--- a/roles/matrix-base/defaults/main.yml
+++ b/roles/matrix-base/defaults/main.yml
@@ -66,3 +66,7 @@ run_setup: true
 run_self_check: true
 run_start: true
 run_stop: true
+
+# Building every docker image from source on the target host
+# Controlling docker image build is possible on a per unit base
+matrix_container_images_self_build: false
\ No newline at end of file
diff --git a/roles/matrix-bridge-mautrix-hangouts/defaults/main.yml b/roles/matrix-bridge-mautrix-hangouts/defaults/main.yml
index 0f3b14c5a..89eea3525 100644
--- a/roles/matrix-bridge-mautrix-hangouts/defaults/main.yml
+++ b/roles/matrix-bridge-mautrix-hangouts/defaults/main.yml
@@ -2,7 +2,7 @@
 # See: https://github.com/tulir/mautrix-hangouts
 
 matrix_mautrix_hangouts_enabled: true
-matrix_mautrix_hangouts_self_build: true
+matrix_mautrix_hangouts_self_build: "{{ matrix_container_images_self_build }}"
 
 # See: https://mau.dev/tulir/mautrix-hangouts/container_registry
 matrix_mautrix_hangouts_docker_image: "dock.mau.dev/tulir/mautrix-hangouts:latest"
diff --git a/roles/matrix-coturn/defaults/main.yml b/roles/matrix-coturn/defaults/main.yml
index a8b71bcbd..214401b85 100644
--- a/roles/matrix-coturn/defaults/main.yml
+++ b/roles/matrix-coturn/defaults/main.yml
@@ -1,5 +1,5 @@
 matrix_coturn_enabled: true
-matrix_coturn_self_build: false
+matrix_coturn_self_build: "{{ matrix_container_images_self_build }}"
 
 matrix_coturn_docker_image: "instrumentisto/coturn:4.5.1.1"
 matrix_coturn_docker_image_force_pull: "{{ matrix_coturn_docker_image.endswith(':latest') }}"
diff --git a/roles/matrix-mxisd/defaults/main.yml b/roles/matrix-mxisd/defaults/main.yml
index b3a921bbf..e882bc13a 100644
--- a/roles/matrix-mxisd/defaults/main.yml
+++ b/roles/matrix-mxisd/defaults/main.yml
@@ -2,7 +2,7 @@
 # See: https://github.com/kamax-matrix/mxisd
 
 matrix_mxisd_enabled: true
-matrix_mxisd_self_build: false
+matrix_mxisd_self_build: "{{ matrix_container_images_self_build }}"
 
 matrix_mxisd_docker_image: "kamax/mxisd:1.4.6"
 matrix_mxisd_docker_image_force_pull: "{{ matrix_mxisd_docker_image.endswith(':latest') }}"
diff --git a/roles/matrix-riot-web/defaults/main.yml b/roles/matrix-riot-web/defaults/main.yml
index bdbce0f30..efccdf21a 100644
--- a/roles/matrix-riot-web/defaults/main.yml
+++ b/roles/matrix-riot-web/defaults/main.yml
@@ -1,5 +1,5 @@
 matrix_riot_web_enabled: true
-matrix_riot_web_self_build: false
+matrix_riot_web_self_build: "{{ matrix_container_images_self_build }}"
 
 matrix_riot_web_docker_image: "vectorim/riot-web:v1.5.12"
 matrix_riot_web_docker_image_force_pull: "{{ matrix_riot_web_docker_image.endswith(':latest') }}"
diff --git a/roles/matrix-synapse/defaults/main.yml b/roles/matrix-synapse/defaults/main.yml
index 1f0d49d81..1a992a978 100644
--- a/roles/matrix-synapse/defaults/main.yml
+++ b/roles/matrix-synapse/defaults/main.yml
@@ -2,7 +2,7 @@
 # See: https://github.com/matrix-org/synapse
 
 matrix_synapse_enabled: true
-matrix_synapse_self_build: false
+matrix_synapse_self_build: "{{ matrix_container_images_self_build }}"
 
 matrix_synapse_docker_image: "matrixdotorg/synapse:v1.11.1"
 matrix_synapse_docker_image_force_pull: "{{ matrix_synapse_docker_image.endswith(':latest') }}"

From 976f1a4582069abcf99d2f535a5379551d6048c2 Mon Sep 17 00:00:00 2001
From: Horvath Gergely <horvathg@hekate>
Date: Sat, 14 Mar 2020 19:54:13 +0100
Subject: [PATCH 42/59] fix riot-web version strip

---
 roles/matrix-riot-web/tasks/setup_riot_web.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/matrix-riot-web/tasks/setup_riot_web.yml b/roles/matrix-riot-web/tasks/setup_riot_web.yml
index 2216a0ffa..2dac85cfa 100644
--- a/roles/matrix-riot-web/tasks/setup_riot_web.yml
+++ b/roles/matrix-riot-web/tasks/setup_riot_web.yml
@@ -28,7 +28,7 @@
   git:
     repo: https://github.com/vector-im/riot-web.git
     dest: "{{ matrix_riot_web_docker_src_files_path }}"
-    version: "v{{ matrix_riot_web_docker_image.split(':')[1] }}"
+    version: "{{ matrix_riot_web_docker_image.split(':')[1] }}"
     force: "yes"
   when: "matrix_riot_web_enabled|bool and matrix_riot_web_self_build"
 

From 30fd1ab2d658ccfd6f02df917727fdda47b755f1 Mon Sep 17 00:00:00 2001
From: Horvath Gergely <horvathg@hekate>
Date: Sat, 14 Mar 2020 20:40:31 +0100
Subject: [PATCH 43/59] add forgotten support for  variable for
 matrix-bridge-mautrix-facebook role

---
 roles/matrix-bridge-mautrix-facebook/defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/matrix-bridge-mautrix-facebook/defaults/main.yml b/roles/matrix-bridge-mautrix-facebook/defaults/main.yml
index 93a3134b9..9acf22281 100644
--- a/roles/matrix-bridge-mautrix-facebook/defaults/main.yml
+++ b/roles/matrix-bridge-mautrix-facebook/defaults/main.yml
@@ -2,7 +2,7 @@
 # See: https://github.com/tulir/mautrix-facebook
 
 matrix_mautrix_facebook_enabled: true
-matrix_mautrix_facebook_self_build: false
+matrix_mautrix_facebook_self_build: "{{ matrix_container_images_self_build }}"
 
 # See: https://mau.dev/tulir/mautrix-facebook/container_registry
 matrix_mautrix_facebook_docker_image: "dock.mau.dev/tulir/mautrix-facebook:latest"

From 447dd94ff97d89549179b6d14ce09d20e69eb20f Mon Sep 17 00:00:00 2001
From: Horvath Gergely <horvathg@hekate>
Date: Sat, 14 Mar 2020 20:41:01 +0100
Subject: [PATCH 44/59] update documentation

---
 docs/prerequisites.md |  2 +-
 docs/raspberry-pi.md  | 17 -----------------
 docs/self-build.md    | 17 +++++++++++++++++
 3 files changed, 18 insertions(+), 18 deletions(-)
 delete mode 100644 docs/raspberry-pi.md
 create mode 100644 docs/self-build.md

diff --git a/docs/prerequisites.md b/docs/prerequisites.md
index a8b1e6adb..4e72e2ead 100644
--- a/docs/prerequisites.md
+++ b/docs/prerequisites.md
@@ -1,6 +1,6 @@
 # Prerequisites
 
-- An x86 server running **CentOS** (7 only for now; [8 is not yet supported](https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/300)), **Debian** (9/Stretch+) or **Ubuntu** (16.04+). This playbook doesn't support running on ARM ([see](https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/299)), however some workarounnd exist for the [Raspberry Pi](raspberry-pi.md). We only strive to support released stable versions of distributions, not betas or pre-releases. This playbook can take over your whole server or co-exist with other services that you have there.
+- An x86 server running **CentOS** (7 only for now; [8 is not yet supported](https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/300)), **Debian** (9/Stretch+) or **Ubuntu** (16.04+). This playbook doesn't support running on ARM ([see](https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/299)), however a minimal subset of the tools can be built on the host, which may result in a working configuration, even on a Raspberry pi (see [Self-Building](self-building.md)). We only strive to support released stable versions of distributions, not betas or pre-releases. This playbook can take over your whole server or co-exist with other services that you have there.
 
 - [Python](https://www.python.org/) being installed on the server. Most distributions install Python by default, but some don't (e.g. Ubuntu 18.04) and require manual installation (something like `apt-get install python`).
 
diff --git a/docs/raspberry-pi.md b/docs/raspberry-pi.md
deleted file mode 100644
index d5cd0f071..000000000
--- a/docs/raspberry-pi.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Raspberry Pi
-
-The playbook support for Raspberry Pi is now in beta(ish). The problem is that, docker containers are not architecture independent, and most of them are not build for arm. Some roles have been updated, so they built the necessary image on the host. It needs more space, as some build tools need to be present (like Java, for mxisd).
-
-To use these modification there is a variable that needs to be switched to enable this functionality. Add this to your vars.yaml file:
-```
-matrix_raspberry_pi = true
-```
-
-List of roles that builtds the image:
-- synapse
-- coturn
-- mxisd
-- matrix-bridge-mautrix-facebook
-- matrix-bridge-mautrix-hangouts
-
-nginx hopefully works as it has an arm image already.
diff --git a/docs/self-build.md b/docs/self-build.md
new file mode 100644
index 000000000..b95f60a9b
--- /dev/null
+++ b/docs/self-build.md
@@ -0,0 +1,17 @@
+# Self building
+
+The playbook supports the self building of a couple of components. This may be useful for architectures beside x86_64 that have no docker images right now (e g. the armv7 for the Raspberry Pi). Some roles have been updated, so they build the necessary image on the host. It needs more space, as some build tools need to be present (like Java, for mxisd).
+
+To use these modification there is a variable that needs to be switched to enable this functionality. Add this to your vars.yaml file:
+```
+matrix_container_images_self_build = true
+```
+Setting that variable will self-build every role where applicable. Self-building can be set on a per-role basis as well.
+
+List of roles where self-building the docker image is currently possible:
+- synapse
+- riot-web
+- coturn
+- mxisd
+- matrix-bridge-mautrix-facebook
+- matrix-bridge-mautrix-hangouts

From 8fe97abe7db32d06b72a7edc0b62de991e3e3331 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Sun, 15 Mar 2020 10:10:41 +0200
Subject: [PATCH 45/59] Wire matrix_container_images_self_build to self_build
 variables via group_vars/matrix_servers

This keeps the roles cleaner and more independent of matrix-base,
which may be important for people building their own playbook
out of the individual roles and not using the matrix-base role.
---
 group_vars/matrix_servers                            | 12 ++++++++++++
 .../matrix-bridge-mautrix-facebook/defaults/main.yml |  3 ++-
 .../matrix-bridge-mautrix-hangouts/defaults/main.yml |  3 ++-
 roles/matrix-coturn/defaults/main.yml                |  3 ++-
 roles/matrix-mxisd/defaults/main.yml                 |  3 ++-
 roles/matrix-riot-web/defaults/main.yml              |  3 ++-
 roles/matrix-synapse/defaults/main.yml               |  3 ++-
 7 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers
index 5efde0c95..601b05ff2 100755
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@@ -172,6 +172,8 @@ matrix_appservice_irc_homeserver_token: "{{ matrix_synapse_macaroon_secret_key |
 # We don't enable bridges by default.
 matrix_mautrix_facebook_enabled: false
 
+matrix_mautrix_facebook_self_build: "{{ matrix_container_images_self_build }}"
+
 matrix_mautrix_facebook_systemd_required_services_list: |
   {{
     ['docker.service']
@@ -201,6 +203,8 @@ matrix_mautrix_facebook_login_shared_secret: "{{ matrix_synapse_ext_password_pro
 # We don't enable bridges by default.
 matrix_mautrix_hangouts_enabled: false
 
+matrix_mautrix_hangouts_self_build: "{{ matrix_container_images_self_build }}"
+
 matrix_mautrix_hangouts_systemd_required_services_list: |
   {{
     ['docker.service']
@@ -329,6 +333,8 @@ matrix_corporal_matrix_registration_shared_secret: "{{ matrix_synapse_registrati
 
 matrix_coturn_enabled: true
 
+matrix_coturn_self_build: "{{ matrix_container_images_self_build }}"
+
 matrix_coturn_turn_external_ip_address: "{{ ansible_host }}"
 
 matrix_coturn_tls_enabled: true
@@ -415,6 +421,8 @@ matrix_mailer_enabled: true
 # If you wish to use the public identity servers (matrix.org, vector.im) instead of your own you may wish to disable this.
 matrix_mxisd_enabled: true
 
+matrix_mxisd_self_build: "{{ matrix_container_images_self_build }}"
+
 # Normally, matrix-nginx-proxy is enabled and nginx can reach mxisd over the container network.
 # If matrix-nginx-proxy is not enabled, or you otherwise have a need for it, you can expose
 # mxisd's web-server port.
@@ -559,6 +567,8 @@ matrix_postgres_db_name: "homeserver"
 # If you wish to connect to your Matrix server by other means, you may wish to disable this.
 matrix_riot_web_enabled: true
 
+matrix_riot_web_self_build: "{{ matrix_container_images_self_build }}"
+
 # Normally, matrix-nginx-proxy is enabled and nginx can reach riot-web over the container network.
 # If matrix-nginx-proxy is not enabled, or you otherwise have a need for it, you can expose
 # the riot-web HTTP port to the local host.
@@ -600,6 +610,8 @@ matrix_riot_web_welcome_user_id: ~
 #
 ######################################################################
 
+matrix_synapse_self_build: "{{ matrix_container_images_self_build }}"
+
 # When mxisd is enabled, we can use it instead of the default public Identity servers.
 matrix_synapse_trusted_third_party_id_servers: "{{ [matrix_server_fqn_matrix] if matrix_mxisd_enabled else matrix_synapse_id_servers_public }}"
 
diff --git a/roles/matrix-bridge-mautrix-facebook/defaults/main.yml b/roles/matrix-bridge-mautrix-facebook/defaults/main.yml
index 9acf22281..cd1770d42 100644
--- a/roles/matrix-bridge-mautrix-facebook/defaults/main.yml
+++ b/roles/matrix-bridge-mautrix-facebook/defaults/main.yml
@@ -2,7 +2,8 @@
 # See: https://github.com/tulir/mautrix-facebook
 
 matrix_mautrix_facebook_enabled: true
-matrix_mautrix_facebook_self_build: "{{ matrix_container_images_self_build }}"
+
+matrix_mautrix_facebook_self_build: false
 
 # See: https://mau.dev/tulir/mautrix-facebook/container_registry
 matrix_mautrix_facebook_docker_image: "dock.mau.dev/tulir/mautrix-facebook:latest"
diff --git a/roles/matrix-bridge-mautrix-hangouts/defaults/main.yml b/roles/matrix-bridge-mautrix-hangouts/defaults/main.yml
index 89eea3525..de31d83e3 100644
--- a/roles/matrix-bridge-mautrix-hangouts/defaults/main.yml
+++ b/roles/matrix-bridge-mautrix-hangouts/defaults/main.yml
@@ -2,7 +2,8 @@
 # See: https://github.com/tulir/mautrix-hangouts
 
 matrix_mautrix_hangouts_enabled: true
-matrix_mautrix_hangouts_self_build: "{{ matrix_container_images_self_build }}"
+
+matrix_mautrix_hangouts_self_build: false
 
 # See: https://mau.dev/tulir/mautrix-hangouts/container_registry
 matrix_mautrix_hangouts_docker_image: "dock.mau.dev/tulir/mautrix-hangouts:latest"
diff --git a/roles/matrix-coturn/defaults/main.yml b/roles/matrix-coturn/defaults/main.yml
index 214401b85..cbcc135ea 100644
--- a/roles/matrix-coturn/defaults/main.yml
+++ b/roles/matrix-coturn/defaults/main.yml
@@ -1,5 +1,6 @@
 matrix_coturn_enabled: true
-matrix_coturn_self_build: "{{ matrix_container_images_self_build }}"
+
+matrix_coturn_self_build: false
 
 matrix_coturn_docker_image: "instrumentisto/coturn:4.5.1.1"
 matrix_coturn_docker_image_force_pull: "{{ matrix_coturn_docker_image.endswith(':latest') }}"
diff --git a/roles/matrix-mxisd/defaults/main.yml b/roles/matrix-mxisd/defaults/main.yml
index e882bc13a..b291c5ce5 100644
--- a/roles/matrix-mxisd/defaults/main.yml
+++ b/roles/matrix-mxisd/defaults/main.yml
@@ -2,7 +2,8 @@
 # See: https://github.com/kamax-matrix/mxisd
 
 matrix_mxisd_enabled: true
-matrix_mxisd_self_build: "{{ matrix_container_images_self_build }}"
+
+matrix_mxisd_self_build: false
 
 matrix_mxisd_docker_image: "kamax/mxisd:1.4.6"
 matrix_mxisd_docker_image_force_pull: "{{ matrix_mxisd_docker_image.endswith(':latest') }}"
diff --git a/roles/matrix-riot-web/defaults/main.yml b/roles/matrix-riot-web/defaults/main.yml
index efccdf21a..cafe4ceb9 100644
--- a/roles/matrix-riot-web/defaults/main.yml
+++ b/roles/matrix-riot-web/defaults/main.yml
@@ -1,5 +1,6 @@
 matrix_riot_web_enabled: true
-matrix_riot_web_self_build: "{{ matrix_container_images_self_build }}"
+
+matrix_riot_web_self_build: false
 
 matrix_riot_web_docker_image: "vectorim/riot-web:v1.5.12"
 matrix_riot_web_docker_image_force_pull: "{{ matrix_riot_web_docker_image.endswith(':latest') }}"
diff --git a/roles/matrix-synapse/defaults/main.yml b/roles/matrix-synapse/defaults/main.yml
index 1a992a978..f3e6d4fe8 100644
--- a/roles/matrix-synapse/defaults/main.yml
+++ b/roles/matrix-synapse/defaults/main.yml
@@ -2,7 +2,8 @@
 # See: https://github.com/matrix-org/synapse
 
 matrix_synapse_enabled: true
-matrix_synapse_self_build: "{{ matrix_container_images_self_build }}"
+
+matrix_synapse_self_build: false
 
 matrix_synapse_docker_image: "matrixdotorg/synapse:v1.11.1"
 matrix_synapse_docker_image_force_pull: "{{ matrix_synapse_docker_image.endswith(':latest') }}"

From 2b85fde103f0a80223fdf6708225979e5818431d Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Sun, 15 Mar 2020 10:15:27 +0200
Subject: [PATCH 46/59] Rename some variables for consistency

---
 group_vars/matrix_servers                            | 12 ++++++------
 .../matrix-bridge-mautrix-facebook/defaults/main.yml |  2 +-
 roles/matrix-bridge-mautrix-facebook/tasks/init.yml  |  2 +-
 .../tasks/setup_install.yml                          |  8 ++++----
 .../matrix-bridge-mautrix-hangouts/defaults/main.yml |  2 +-
 roles/matrix-bridge-mautrix-hangouts/tasks/init.yml  |  2 +-
 .../tasks/setup_install.yml                          | 10 +++++-----
 roles/matrix-coturn/defaults/main.yml                |  2 +-
 roles/matrix-coturn/tasks/init.yml                   |  2 +-
 roles/matrix-coturn/tasks/setup_coturn.yml           |  8 ++++----
 roles/matrix-mxisd/defaults/main.yml                 |  2 +-
 roles/matrix-mxisd/tasks/init.yml                    |  2 +-
 roles/matrix-mxisd/tasks/setup_mxisd.yml             | 10 +++++-----
 roles/matrix-riot-web/defaults/main.yml              |  2 +-
 roles/matrix-riot-web/tasks/init.yml                 |  2 +-
 roles/matrix-riot-web/tasks/setup_riot_web.yml       |  8 ++++----
 roles/matrix-synapse/defaults/main.yml               |  2 +-
 roles/matrix-synapse/tasks/init.yml                  |  2 +-
 roles/matrix-synapse/tasks/setup_synapse.yml         |  2 +-
 roles/matrix-synapse/tasks/synapse/setup_install.yml |  6 +++---
 20 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers
index 601b05ff2..f722e2659 100755
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@@ -172,7 +172,7 @@ matrix_appservice_irc_homeserver_token: "{{ matrix_synapse_macaroon_secret_key |
 # We don't enable bridges by default.
 matrix_mautrix_facebook_enabled: false
 
-matrix_mautrix_facebook_self_build: "{{ matrix_container_images_self_build }}"
+matrix_mautrix_facebook_container_image_self_build: "{{ matrix_container_images_self_build }}"
 
 matrix_mautrix_facebook_systemd_required_services_list: |
   {{
@@ -203,7 +203,7 @@ matrix_mautrix_facebook_login_shared_secret: "{{ matrix_synapse_ext_password_pro
 # We don't enable bridges by default.
 matrix_mautrix_hangouts_enabled: false
 
-matrix_mautrix_hangouts_self_build: "{{ matrix_container_images_self_build }}"
+matrix_mautrix_hangouts_container_image_self_build: "{{ matrix_container_images_self_build }}"
 
 matrix_mautrix_hangouts_systemd_required_services_list: |
   {{
@@ -333,7 +333,7 @@ matrix_corporal_matrix_registration_shared_secret: "{{ matrix_synapse_registrati
 
 matrix_coturn_enabled: true
 
-matrix_coturn_self_build: "{{ matrix_container_images_self_build }}"
+matrix_coturn_container_image_self_build: "{{ matrix_container_images_self_build }}"
 
 matrix_coturn_turn_external_ip_address: "{{ ansible_host }}"
 
@@ -421,7 +421,7 @@ matrix_mailer_enabled: true
 # If you wish to use the public identity servers (matrix.org, vector.im) instead of your own you may wish to disable this.
 matrix_mxisd_enabled: true
 
-matrix_mxisd_self_build: "{{ matrix_container_images_self_build }}"
+matrix_mxisd_container_image_self_build: "{{ matrix_container_images_self_build }}"
 
 # Normally, matrix-nginx-proxy is enabled and nginx can reach mxisd over the container network.
 # If matrix-nginx-proxy is not enabled, or you otherwise have a need for it, you can expose
@@ -567,7 +567,7 @@ matrix_postgres_db_name: "homeserver"
 # If you wish to connect to your Matrix server by other means, you may wish to disable this.
 matrix_riot_web_enabled: true
 
-matrix_riot_web_self_build: "{{ matrix_container_images_self_build }}"
+matrix_riot_web_container_image_self_build: "{{ matrix_container_images_self_build }}"
 
 # Normally, matrix-nginx-proxy is enabled and nginx can reach riot-web over the container network.
 # If matrix-nginx-proxy is not enabled, or you otherwise have a need for it, you can expose
@@ -610,7 +610,7 @@ matrix_riot_web_welcome_user_id: ~
 #
 ######################################################################
 
-matrix_synapse_self_build: "{{ matrix_container_images_self_build }}"
+matrix_synapse_container_image_self_build: "{{ matrix_container_images_self_build }}"
 
 # When mxisd is enabled, we can use it instead of the default public Identity servers.
 matrix_synapse_trusted_third_party_id_servers: "{{ [matrix_server_fqn_matrix] if matrix_mxisd_enabled else matrix_synapse_id_servers_public }}"
diff --git a/roles/matrix-bridge-mautrix-facebook/defaults/main.yml b/roles/matrix-bridge-mautrix-facebook/defaults/main.yml
index cd1770d42..30693bd58 100644
--- a/roles/matrix-bridge-mautrix-facebook/defaults/main.yml
+++ b/roles/matrix-bridge-mautrix-facebook/defaults/main.yml
@@ -3,7 +3,7 @@
 
 matrix_mautrix_facebook_enabled: true
 
-matrix_mautrix_facebook_self_build: false
+matrix_mautrix_facebook_container_image_self_build: false
 
 # See: https://mau.dev/tulir/mautrix-facebook/container_registry
 matrix_mautrix_facebook_docker_image: "dock.mau.dev/tulir/mautrix-facebook:latest"
diff --git a/roles/matrix-bridge-mautrix-facebook/tasks/init.yml b/roles/matrix-bridge-mautrix-facebook/tasks/init.yml
index 85bb3838d..c9688cf04 100644
--- a/roles/matrix-bridge-mautrix-facebook/tasks/init.yml
+++ b/roles/matrix-bridge-mautrix-facebook/tasks/init.yml
@@ -20,4 +20,4 @@
 - name: Fail if running on Ansible lower than 2.8 and trying self building
   fail:
     msg: "To self build Mautrix Facebook image, you should usa ansible 2.8 or higher. E.g. pip contains such packages."
-  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_mautrix_facebook_self_build"
\ No newline at end of file
+  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_mautrix_facebook_container_image_self_build"
diff --git a/roles/matrix-bridge-mautrix-facebook/tasks/setup_install.yml b/roles/matrix-bridge-mautrix-facebook/tasks/setup_install.yml
index 1088f0b43..c21ba216c 100644
--- a/roles/matrix-bridge-mautrix-facebook/tasks/setup_install.yml
+++ b/roles/matrix-bridge-mautrix-facebook/tasks/setup_install.yml
@@ -14,7 +14,7 @@
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_mautrix_facebook_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
     force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_mautrix_facebook_docker_image_force_pull }}"
-  when: matrix_mautrix_facebook_enabled|bool and not matrix_mautrix_facebook_self_build
+  when: matrix_mautrix_facebook_enabled|bool and not matrix_mautrix_facebook_container_image_self_build
 
 - name: Ensure Mautrix Facebook paths exist
   file:
@@ -27,7 +27,7 @@
     - "{{ matrix_mautrix_facebook_base_path }}"
     - "{{ matrix_mautrix_facebook_config_path }}"
     - "{{ matrix_mautrix_facebook_data_path }}"
-    - { src: "{{ matrix_mautrix_facebook_docker_src_files_path }}", when: "{{ matrix_mautrix_facebook_self_build }}" }
+    - { src: "{{ matrix_mautrix_facebook_docker_src_files_path }}", when: "{{ matrix_mautrix_facebook_container_image_self_build }}" }
 
 - name: Ensure Mautrix Facebook repository is present on self-build
   git:
@@ -35,7 +35,7 @@
     dest: "{{ matrix_mautrix_facebook_docker_src_files_path }}"
 #    version: "{{ matrix_coturn_docker_image.split(':')[1] }}"
     force: "yes"
-  when: "matrix_mautrix_facebook_enabled|bool and matrix_mautrix_facebook_self_build"
+  when: "matrix_mautrix_facebook_enabled|bool and matrix_mautrix_facebook_container_image_self_build"
 
 - name: Ensure Mautrix Facebook Docker image is build
   docker_image:
@@ -45,7 +45,7 @@
       dockerfile: Dockerfile
       path: "{{ matrix_mautrix_facebook_docker_src_files_path }}"
       pull: yes
-  when: "matrix_mautrix_facebook_enabled|bool and matrix_mautrix_facebook_self_build"
+  when: "matrix_mautrix_facebook_enabled|bool and matrix_mautrix_facebook_container_image_self_build"
 
 - name: Check if an old database file already exists
   stat:
diff --git a/roles/matrix-bridge-mautrix-hangouts/defaults/main.yml b/roles/matrix-bridge-mautrix-hangouts/defaults/main.yml
index de31d83e3..5284bc822 100644
--- a/roles/matrix-bridge-mautrix-hangouts/defaults/main.yml
+++ b/roles/matrix-bridge-mautrix-hangouts/defaults/main.yml
@@ -3,7 +3,7 @@
 
 matrix_mautrix_hangouts_enabled: true
 
-matrix_mautrix_hangouts_self_build: false
+matrix_mautrix_hangouts_container_image_self_build: false
 
 # See: https://mau.dev/tulir/mautrix-hangouts/container_registry
 matrix_mautrix_hangouts_docker_image: "dock.mau.dev/tulir/mautrix-hangouts:latest"
diff --git a/roles/matrix-bridge-mautrix-hangouts/tasks/init.yml b/roles/matrix-bridge-mautrix-hangouts/tasks/init.yml
index b276a1f65..9dd09d819 100644
--- a/roles/matrix-bridge-mautrix-hangouts/tasks/init.yml
+++ b/roles/matrix-bridge-mautrix-hangouts/tasks/init.yml
@@ -66,4 +66,4 @@
 - name: Fail if running on Ansible lower than 2.8 and trying self building
   fail:
     msg: "To self build Mautrix Hangouts image, you should usa ansible 2.8 or higher. E.g. pip contains such packages."
-  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_mautrix_hangouts_self_build"
+  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_mautrix_hangouts_container_image_self_build"
diff --git a/roles/matrix-bridge-mautrix-hangouts/tasks/setup_install.yml b/roles/matrix-bridge-mautrix-hangouts/tasks/setup_install.yml
index e18778b2d..beed38a7b 100644
--- a/roles/matrix-bridge-mautrix-hangouts/tasks/setup_install.yml
+++ b/roles/matrix-bridge-mautrix-hangouts/tasks/setup_install.yml
@@ -14,7 +14,7 @@
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_mautrix_hangouts_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
     force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_mautrix_hangouts_docker_image_force_pull }}"
-  when: matrix_mautrix_hangouts_enabled|bool and not matrix_mautrix_hangouts_self_build
+  when: matrix_mautrix_hangouts_enabled|bool and not matrix_mautrix_hangouts_container_image_self_build
 
 - name: Ensure Mautrix Hangouts paths exist
   file:
@@ -27,16 +27,16 @@
     - "{{ matrix_mautrix_hangouts_base_path }}"
     - "{{ matrix_mautrix_hangouts_config_path }}"
     - "{{ matrix_mautrix_hangouts_data_path }}"
-    - { src: "{{ matrix_mautrix_hangouts_docker_src_files_path }}", when: "{{ matrix_mautrix_hangouts_self_build }}" }
+    - { src: "{{ matrix_mautrix_hangouts_docker_src_files_path }}", when: "{{ matrix_mautrix_hangouts_container_image_self_build }}" }
 
-  when: matrix_mautrix_hangouts_enabled|bool and not matrix_mautrix_hangouts_self_build
+  when: matrix_mautrix_hangouts_enabled|bool and not matrix_mautrix_hangouts_container_image_self_build
 
 - name: Ensure Mautrix Hangots repository is present on self build
   git:
     repo: https://github.com/tulir/mautrix-hangouts.git
     dest: "{{ matrix_mautrix_hangouts_docker_src_files_path }}"
     force: "yes"
-  when: "matrix_mautrix_hangouts_enabled|bool and matrix_mautrix_hangouts_self_build"
+  when: "matrix_mautrix_hangouts_enabled|bool and matrix_mautrix_hangouts_container_image_self_build"
 
 - name: Ensure Mautrix Hangouts Docker image is build
   docker_image:
@@ -46,7 +46,7 @@
       dockerfile: Dockerfile
       path: "{{ matrix_mautrix_hangouts_docker_src_files_path }}"
       pull: yes
-  when: "matrix_mautrix_hangouts_enabled|bool and matrix_mautrix_hangouts_self_build"
+  when: "matrix_mautrix_hangouts_enabled|bool and matrix_mautrix_hangouts_container_image_self_build"
 
 - name: Check if an old database file already exists
   stat:
diff --git a/roles/matrix-coturn/defaults/main.yml b/roles/matrix-coturn/defaults/main.yml
index cbcc135ea..06063e3b2 100644
--- a/roles/matrix-coturn/defaults/main.yml
+++ b/roles/matrix-coturn/defaults/main.yml
@@ -1,6 +1,6 @@
 matrix_coturn_enabled: true
 
-matrix_coturn_self_build: false
+matrix_coturn_container_image_self_build: false
 
 matrix_coturn_docker_image: "instrumentisto/coturn:4.5.1.1"
 matrix_coturn_docker_image_force_pull: "{{ matrix_coturn_docker_image.endswith(':latest') }}"
diff --git a/roles/matrix-coturn/tasks/init.yml b/roles/matrix-coturn/tasks/init.yml
index 9b97ce6a0..b59feebd0 100644
--- a/roles/matrix-coturn/tasks/init.yml
+++ b/roles/matrix-coturn/tasks/init.yml
@@ -7,4 +7,4 @@
 - name: Fail if running on Ansible lower than 2.8 and trying self building
   fail:
     msg: "To self build Coturn image, you should usa ansible 2.8 or higher. E.g. pip contains such packages."
-  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_coturn_self_build"
+  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_coturn_container_image_self_build"
diff --git a/roles/matrix-coturn/tasks/setup_coturn.yml b/roles/matrix-coturn/tasks/setup_coturn.yml
index ec7a452e5..bd6ef0c9e 100644
--- a/roles/matrix-coturn/tasks/setup_coturn.yml
+++ b/roles/matrix-coturn/tasks/setup_coturn.yml
@@ -12,7 +12,7 @@
     owner: "{{ matrix_user_username }}"
     group: "{{ matrix_user_username }}"
   with_items:
-    - { src: "{{ matrix_coturn_docker_src_files_path }}", when: "{{ matrix_coturn_self_build }}"}
+    - { src: "{{ matrix_coturn_docker_src_files_path }}", when: "{{ matrix_coturn_container_image_self_build }}"}
   when: matrix_riot_web_enabled|bool
 
 - name: Ensure Coturn image is pulled
@@ -21,7 +21,7 @@
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_coturn_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
     force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_coturn_docker_image_force_pull }}"
-  when: matrix_coturn_enabled|bool and not matrix_coturn_self_build
+  when: matrix_coturn_enabled|bool and not matrix_coturn_container_image_self_build
 
 - name: Ensure Coturn repository is present on self-build
   git:
@@ -29,7 +29,7 @@
     dest: "{{ matrix_coturn_docker_src_files_path }}"
     version: "{{ matrix_coturn_docker_image.split(':')[1] }}"
     force: "yes"
-  when: "matrix_coturn_enabled|bool and matrix_coturn_self_build"
+  when: "matrix_coturn_enabled|bool and matrix_coturn_container_image_self_build"
 
 - name: Ensure Coturn Docker image is build
   docker_image:
@@ -39,7 +39,7 @@
       dockerfile: Dockerfile
       path: "{{ matrix_coturn_docker_src_files_path }}"
       pull: yes
-  when: "matrix_coturn_enabled|bool and matrix_coturn_self_build"
+  when: "matrix_coturn_enabled|bool and matrix_coturn_container_image_self_build"
 
 - name: Ensure Coturn configuration path exists
   file:
diff --git a/roles/matrix-mxisd/defaults/main.yml b/roles/matrix-mxisd/defaults/main.yml
index b291c5ce5..605f40281 100644
--- a/roles/matrix-mxisd/defaults/main.yml
+++ b/roles/matrix-mxisd/defaults/main.yml
@@ -3,7 +3,7 @@
 
 matrix_mxisd_enabled: true
 
-matrix_mxisd_self_build: false
+matrix_mxisd_container_image_self_build: false
 
 matrix_mxisd_docker_image: "kamax/mxisd:1.4.6"
 matrix_mxisd_docker_image_force_pull: "{{ matrix_mxisd_docker_image.endswith(':latest') }}"
diff --git a/roles/matrix-mxisd/tasks/init.yml b/roles/matrix-mxisd/tasks/init.yml
index dcae446e2..dcf1d0532 100644
--- a/roles/matrix-mxisd/tasks/init.yml
+++ b/roles/matrix-mxisd/tasks/init.yml
@@ -7,4 +7,4 @@
 - name: Fail if running on Ansible lower than 2.8 and trying self building
   fail:
     msg: "To self build Mxisd image, you should usa ansible 2.8 or higher. E.g. pip contains such packages."
-  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_mxisd_self_build"
+  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_mxisd_container_image_self_build"
diff --git a/roles/matrix-mxisd/tasks/setup_mxisd.yml b/roles/matrix-mxisd/tasks/setup_mxisd.yml
index 92b7163b9..6bcdfb4f0 100644
--- a/roles/matrix-mxisd/tasks/setup_mxisd.yml
+++ b/roles/matrix-mxisd/tasks/setup_mxisd.yml
@@ -14,7 +14,7 @@
   with_items:
     - "{{ matrix_mxisd_config_path }}"
     - "{{ matrix_mxisd_data_path }}"
-    - { src: "{{ matrix_mxisd_docker_src_files_path }}", when: "{{ matrix_mxisd_self_build }}"}
+    - { src: "{{ matrix_mxisd_docker_src_files_path }}", when: "{{ matrix_mxisd_container_image_self_build }}"}
   when: matrix_mxisd_enabled|bool
 
 - name: Ensure mxisd image is pulled
@@ -23,7 +23,7 @@
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_mxisd_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
     force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_mxisd_docker_image_force_pull }}"
-  when: matrix_mxisd_enabled|bool and not matrix_mxisd_self_build
+  when: matrix_mxisd_enabled|bool and not matrix_mxisd_container_image_self_build
 
 - name: Ensure gradel is installed for self-building
   apt:
@@ -31,7 +31,7 @@
       - gradle
     state: present
     update_cache: yes    
-  when: "matrix_mxisd_enabled|bool and matrix_mxisd_self_build"
+  when: "matrix_mxisd_enabled|bool and matrix_mxisd_container_image_self_build"
 
 - name: Ensure mxisd repository is present on self-build
   git:
@@ -39,13 +39,13 @@
     dest: "{{ matrix_mxisd_docker_src_files_path }}"
     version: "v{{ matrix_mxisd_docker_image.split(':')[1] }}"
     force: "yes"
-  when: "matrix_mxisd_enabled|bool and matrix_mxisd_self_build"
+  when: "matrix_mxisd_enabled|bool and matrix_mxisd_container_image_self_build"
 
 - name: Ensure mxisd Docker image is build
   shell: "./gradlew dockerBuild"
   args:
     chdir: "{{ matrix_mxisd_docker_src_files_path }}"
-  when: "matrix_mxisd_enabled|bool and matrix_mxisd_self_build"
+  when: "matrix_mxisd_enabled|bool and matrix_mxisd_container_image_self_build"
 
 - name: Ensure mxisd config installed
   copy:
diff --git a/roles/matrix-riot-web/defaults/main.yml b/roles/matrix-riot-web/defaults/main.yml
index cafe4ceb9..08b141a16 100644
--- a/roles/matrix-riot-web/defaults/main.yml
+++ b/roles/matrix-riot-web/defaults/main.yml
@@ -1,6 +1,6 @@
 matrix_riot_web_enabled: true
 
-matrix_riot_web_self_build: false
+matrix_riot_web_container_image_self_build: false
 
 matrix_riot_web_docker_image: "vectorim/riot-web:v1.5.12"
 matrix_riot_web_docker_image_force_pull: "{{ matrix_riot_web_docker_image.endswith(':latest') }}"
diff --git a/roles/matrix-riot-web/tasks/init.yml b/roles/matrix-riot-web/tasks/init.yml
index 4fc4e6580..7c8a1550c 100644
--- a/roles/matrix-riot-web/tasks/init.yml
+++ b/roles/matrix-riot-web/tasks/init.yml
@@ -7,4 +7,4 @@
 - name: Fail if running on Ansible lower than 2.8 and trying self building
   fail:
     msg: "To self build Riot Web image, you should usa ansible 2.8 or higher. E.g. pip contains such packages."
-  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_riot_web_self_build"
+  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_riot_web_container_image_self_build"
diff --git a/roles/matrix-riot-web/tasks/setup_riot_web.yml b/roles/matrix-riot-web/tasks/setup_riot_web.yml
index 2dac85cfa..2509dbc97 100644
--- a/roles/matrix-riot-web/tasks/setup_riot_web.yml
+++ b/roles/matrix-riot-web/tasks/setup_riot_web.yml
@@ -13,7 +13,7 @@
     group: "{{ matrix_user_username }}"
   with_items:
     - "{{ matrix_riot_web_data_path }}"
-    - { src: "{{ matrix_riot_web_docker_src_files_path }}", when: "{{ matrix_riot_web_self_build }}" }
+    - { src: "{{ matrix_riot_web_docker_src_files_path }}", when: "{{ matrix_riot_web_container_image_self_build }}" }
   when: matrix_riot_web_enabled|bool
 
 - name: Ensure riot-web Docker image is pulled
@@ -22,7 +22,7 @@
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_riot_web_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
     force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_riot_web_docker_image_force_pull }}"
-  when: matrix_riot_web_enabled|bool and not matrix_riot_web_self_build
+  when: matrix_riot_web_enabled|bool and not matrix_riot_web_container_image_self_build
 
 - name: Ensure Riot Web repository is present on self-build
   git:
@@ -30,7 +30,7 @@
     dest: "{{ matrix_riot_web_docker_src_files_path }}"
     version: "{{ matrix_riot_web_docker_image.split(':')[1] }}"
     force: "yes"
-  when: "matrix_riot_web_enabled|bool and matrix_riot_web_self_build"
+  when: "matrix_riot_web_enabled|bool and matrix_riot_web_container_image_self_build"
 
 - name: Ensure Riot Web Docker image is build
   docker_image:
@@ -40,7 +40,7 @@
       dockerfile: Dockerfile
       path: "{{ matrix_riot_web_docker_src_files_path }}"
       pull: yes
-  when: "matrix_riot_web_enabled|bool and matrix_riot_web_self_build"
+  when: "matrix_riot_web_enabled|bool and matrix_riot_web_container_image_self_build"
 
 - name: Ensure Matrix riot-web configuration installed
   copy:
diff --git a/roles/matrix-synapse/defaults/main.yml b/roles/matrix-synapse/defaults/main.yml
index f3e6d4fe8..fe9f5545f 100644
--- a/roles/matrix-synapse/defaults/main.yml
+++ b/roles/matrix-synapse/defaults/main.yml
@@ -3,7 +3,7 @@
 
 matrix_synapse_enabled: true
 
-matrix_synapse_self_build: false
+matrix_synapse_container_image_self_build: false
 
 matrix_synapse_docker_image: "matrixdotorg/synapse:v1.11.1"
 matrix_synapse_docker_image_force_pull: "{{ matrix_synapse_docker_image.endswith(':latest') }}"
diff --git a/roles/matrix-synapse/tasks/init.yml b/roles/matrix-synapse/tasks/init.yml
index b91c42cb1..004a2a920 100644
--- a/roles/matrix-synapse/tasks/init.yml
+++ b/roles/matrix-synapse/tasks/init.yml
@@ -11,4 +11,4 @@
 - name: Fail if running on Ansible lower than 2.8 and trying self building
   fail:
     msg: "To self build Synapse image, you should usa ansible 2.8 or higher. E.g. pip contains such packages."
-  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_synapse_self_build"
+  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_synapse_container_image_self_build"
diff --git a/roles/matrix-synapse/tasks/setup_synapse.yml b/roles/matrix-synapse/tasks/setup_synapse.yml
index 0ce851c7e..8d5f72d24 100644
--- a/roles/matrix-synapse/tasks/setup_synapse.yml
+++ b/roles/matrix-synapse/tasks/setup_synapse.yml
@@ -11,7 +11,7 @@
     - "{{ matrix_synapse_config_dir_path }}"
     - "{{ matrix_synapse_run_path }}"
     - "{{ matrix_synapse_ext_path }}"
-    - { src: "{{ matrix_synapse_docker_src_files_path }}", when: "{{ matrix_synapse_self_build }}" }
+    - { src: "{{ matrix_synapse_docker_src_files_path }}", when: "{{ matrix_synapse_container_image_self_build }}" }
     # We handle matrix_synapse_media_store_path elsewhere (in ./synapse/setup_install.yml),
     # because if it's using Goofys and it's already mounted (from before),
     # trying to chown/chmod it here will cause trouble.
diff --git a/roles/matrix-synapse/tasks/synapse/setup_install.yml b/roles/matrix-synapse/tasks/synapse/setup_install.yml
index 481429a40..41534d2b8 100644
--- a/roles/matrix-synapse/tasks/synapse/setup_install.yml
+++ b/roles/matrix-synapse/tasks/synapse/setup_install.yml
@@ -24,7 +24,7 @@
     dest: "{{ matrix_synapse_docker_src_files_path }}"
     version: "{{ matrix_synapse_docker_image.split(':')[1] }}"
     force: "yes"
-  when: "matrix_synapse_self_build"
+  when: "matrix_synapse_container_image_self_build"
 
 - name: Ensure Synapse Docker image is build
   docker_image:
@@ -34,7 +34,7 @@
       dockerfile: docker/Dockerfile
       path: "{{ matrix_synapse_docker_src_files_path }}"
       pull: yes
-  when: "matrix_synapse_self_build"
+  when: "matrix_synapse_container_image_self_build"
 
 - name: Ensure Synapse Docker image is pulled
   docker_image:
@@ -42,7 +42,7 @@
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_synapse_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
     force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_synapse_docker_image_force_pull }}"
-  when: "not matrix_synapse_self_build"
+  when: "not matrix_synapse_container_image_self_build"
 
 - name: Check if a Synapse signing key exists
   stat:

From 063e988db2962945b82e28360232db0a0e3797d6 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Sun, 15 Mar 2020 11:26:24 +0200
Subject: [PATCH 47/59] Make gradle installation fail in a friendlier way on
 CentOS

---
 roles/matrix-mxisd/tasks/setup_mxisd.yml | 45 +++++++++++++-----------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/roles/matrix-mxisd/tasks/setup_mxisd.yml b/roles/matrix-mxisd/tasks/setup_mxisd.yml
index 6bcdfb4f0..27c00c70b 100644
--- a/roles/matrix-mxisd/tasks/setup_mxisd.yml
+++ b/roles/matrix-mxisd/tasks/setup_mxisd.yml
@@ -25,26 +25,31 @@
     force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_mxisd_docker_image_force_pull }}"
   when: matrix_mxisd_enabled|bool and not matrix_mxisd_container_image_self_build
 
-- name: Ensure gradel is installed for self-building
-  apt:
-    name:
-      - gradle
-    state: present
-    update_cache: yes    
-  when: "matrix_mxisd_enabled|bool and matrix_mxisd_container_image_self_build"
-
-- name: Ensure mxisd repository is present on self-build
-  git:
-    repo: https://github.com/kamax-matrix/mxisd.git
-    dest: "{{ matrix_mxisd_docker_src_files_path }}"
-    version: "v{{ matrix_mxisd_docker_image.split(':')[1] }}"
-    force: "yes"
-  when: "matrix_mxisd_enabled|bool and matrix_mxisd_container_image_self_build"
-
-- name: Ensure mxisd Docker image is build
-  shell: "./gradlew dockerBuild"
-  args:
-    chdir: "{{ matrix_mxisd_docker_src_files_path }}"
+- block:
+  - name: Ensure gradle is installed for self-building
+    apt:
+      name:
+        - gradle
+      state: present
+      update_cache: yes
+    when: (ansible_os_family == 'Debian')
+
+  - name: Ensure gradle is installed for self-building
+    fail:
+      msg: "Installing gradle on CentOS is currently not supported, so self-building mxisd cannot happen at this time"
+    when: ansible_distribution == 'CentOS'
+
+  - name: Ensure mxisd repository is present on self-build
+    git:
+      repo: https://github.com/kamax-matrix/mxisd.git
+      dest: "{{ matrix_mxisd_docker_src_files_path }}"
+      version: "v{{ matrix_mxisd_docker_image.split(':')[1] }}"
+      force: "yes"
+
+  - name: Ensure mxisd Docker image is built
+    shell: "./gradlew dockerBuild"
+    args:
+      chdir: "{{ matrix_mxisd_docker_src_files_path }}"
   when: "matrix_mxisd_enabled|bool and matrix_mxisd_container_image_self_build"
 
 - name: Ensure mxisd config installed

From 3cee815baf8110e14baa0c7ea29733cf87cd260e Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Sun, 15 Mar 2020 11:34:35 +0200
Subject: [PATCH 48/59] Fix some typos

---
 docs/self-build.md                                          | 6 +++---
 .../matrix-bridge-mautrix-facebook/tasks/setup_install.yml  | 2 +-
 .../matrix-bridge-mautrix-hangouts/tasks/setup_install.yml  | 2 +-
 roles/matrix-coturn/tasks/setup_coturn.yml                  | 2 +-
 roles/matrix-riot-web/tasks/setup_riot_web.yml              | 2 +-
 roles/matrix-synapse/tasks/synapse/setup_install.yml        | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/self-build.md b/docs/self-build.md
index b95f60a9b..44b660761 100644
--- a/docs/self-build.md
+++ b/docs/self-build.md
@@ -2,11 +2,11 @@
 
 The playbook supports the self building of a couple of components. This may be useful for architectures beside x86_64 that have no docker images right now (e g. the armv7 for the Raspberry Pi). Some roles have been updated, so they build the necessary image on the host. It needs more space, as some build tools need to be present (like Java, for mxisd).
 
-To use these modification there is a variable that needs to be switched to enable this functionality. Add this to your vars.yaml file:
-```
+To use these modification there is a variable that needs to be switched to enable this functionality. Add this to your `vars.yaml` file:
+```yaml
 matrix_container_images_self_build = true
 ```
-Setting that variable will self-build every role where applicable. Self-building can be set on a per-role basis as well.
+Setting that variable will self-build every role which supports self-building. Self-building can be set on a per-role basis as well.
 
 List of roles where self-building the docker image is currently possible:
 - synapse
diff --git a/roles/matrix-bridge-mautrix-facebook/tasks/setup_install.yml b/roles/matrix-bridge-mautrix-facebook/tasks/setup_install.yml
index c21ba216c..5a70c2e43 100644
--- a/roles/matrix-bridge-mautrix-facebook/tasks/setup_install.yml
+++ b/roles/matrix-bridge-mautrix-facebook/tasks/setup_install.yml
@@ -37,7 +37,7 @@
     force: "yes"
   when: "matrix_mautrix_facebook_enabled|bool and matrix_mautrix_facebook_container_image_self_build"
 
-- name: Ensure Mautrix Facebook Docker image is build
+- name: Ensure Mautrix Facebook Docker image is built
   docker_image:
     name: "{{ matrix_mautrix_facebook_docker_image }}"
     source: build
diff --git a/roles/matrix-bridge-mautrix-hangouts/tasks/setup_install.yml b/roles/matrix-bridge-mautrix-hangouts/tasks/setup_install.yml
index beed38a7b..db1fe736d 100644
--- a/roles/matrix-bridge-mautrix-hangouts/tasks/setup_install.yml
+++ b/roles/matrix-bridge-mautrix-hangouts/tasks/setup_install.yml
@@ -38,7 +38,7 @@
     force: "yes"
   when: "matrix_mautrix_hangouts_enabled|bool and matrix_mautrix_hangouts_container_image_self_build"
 
-- name: Ensure Mautrix Hangouts Docker image is build
+- name: Ensure Mautrix Hangouts Docker image is built
   docker_image:
     name: "{{ matrix_mautrix_hangouts_docker_image }}"
     source: build
diff --git a/roles/matrix-coturn/tasks/setup_coturn.yml b/roles/matrix-coturn/tasks/setup_coturn.yml
index bd6ef0c9e..d86e4b22f 100644
--- a/roles/matrix-coturn/tasks/setup_coturn.yml
+++ b/roles/matrix-coturn/tasks/setup_coturn.yml
@@ -31,7 +31,7 @@
     force: "yes"
   when: "matrix_coturn_enabled|bool and matrix_coturn_container_image_self_build"
 
-- name: Ensure Coturn Docker image is build
+- name: Ensure Coturn Docker image is built
   docker_image:
     name: "{{ matrix_coturn_docker_image }}"
     source: build
diff --git a/roles/matrix-riot-web/tasks/setup_riot_web.yml b/roles/matrix-riot-web/tasks/setup_riot_web.yml
index 2509dbc97..feccbe816 100644
--- a/roles/matrix-riot-web/tasks/setup_riot_web.yml
+++ b/roles/matrix-riot-web/tasks/setup_riot_web.yml
@@ -32,7 +32,7 @@
     force: "yes"
   when: "matrix_riot_web_enabled|bool and matrix_riot_web_container_image_self_build"
 
-- name: Ensure Riot Web Docker image is build
+- name: Ensure Riot Web Docker image is built
   docker_image:
     name: "{{ matrix_riot_web_docker_image }}"
     source: build
diff --git a/roles/matrix-synapse/tasks/synapse/setup_install.yml b/roles/matrix-synapse/tasks/synapse/setup_install.yml
index 41534d2b8..cf24cefb5 100644
--- a/roles/matrix-synapse/tasks/synapse/setup_install.yml
+++ b/roles/matrix-synapse/tasks/synapse/setup_install.yml
@@ -26,7 +26,7 @@
     force: "yes"
   when: "matrix_synapse_container_image_self_build"
 
-- name: Ensure Synapse Docker image is build
+- name: Ensure Synapse Docker image is built
   docker_image:
     name: "{{ matrix_synapse_docker_image }}"
     source: build

From 8dd187ac55c3ed19b39412e2858a826ebeb91a0d Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Sun, 15 Mar 2020 12:54:41 +0200
Subject: [PATCH 49/59] Update changelog and documentation

---
 CHANGELOG.md                             | 10 ++++++++++
 docs/{self-build.md => self-building.md} |  6 ++++--
 2 files changed, 14 insertions(+), 2 deletions(-)
 rename docs/{self-build.md => self-building.md} (52%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 32153869d..5ab03e7e9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+# 2020-03-15
+
+## Raspberry Pi support
+
+The playbook supports installing to a Raspberry Pi server, for at least some of the services.
+
+Since most ready-made container images do not support that architecture, we achieve this by building images locally on the device itself.
+See our [Self-building documentation page](docs/self-building.md) for how to get started.
+
+
 # 2020-02-26
 
 ## Riot-web themes are here
diff --git a/docs/self-build.md b/docs/self-building.md
similarity index 52%
rename from docs/self-build.md
rename to docs/self-building.md
index 44b660761..a4d6fad9c 100644
--- a/docs/self-build.md
+++ b/docs/self-building.md
@@ -1,6 +1,6 @@
-# Self building
+# Self-building
 
-The playbook supports the self building of a couple of components. This may be useful for architectures beside x86_64 that have no docker images right now (e g. the armv7 for the Raspberry Pi). Some roles have been updated, so they build the necessary image on the host. It needs more space, as some build tools need to be present (like Java, for mxisd).
+The playbook supports the self-building of some of its components. This may be useful for architectures besides x86_64, which have no Docker images right now (e g. the armv7 for the Raspberry Pi). Some playbook roles have been updated, so they build the necessary image on the host. It needs more space, as some build tools need to be present (like Java, for mxisd).
 
 To use these modification there is a variable that needs to be switched to enable this functionality. Add this to your `vars.yaml` file:
 ```yaml
@@ -15,3 +15,5 @@ List of roles where self-building the docker image is currently possible:
 - mxisd
 - matrix-bridge-mautrix-facebook
 - matrix-bridge-mautrix-hangouts
+
+Adding self-building support to other roles is welcome. Feel free to contribute!

From bca8afc3c52c3cbd930c0fe8935ca32b483ac5fa Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Sun, 15 Mar 2020 12:58:28 +0200
Subject: [PATCH 50/59] =?UTF-8?q?Update=20changelog=20to=20credit=20Gergel?=
 =?UTF-8?q?y=20Horv=C3=A1th?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Related to #386 (Github Pull Request)
---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ab03e7e9..31771186b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## Raspberry Pi support
 
-The playbook supports installing to a Raspberry Pi server, for at least some of the services.
+Thanks to [Gergely Horváth](https://github.com/hooger)'s effort, the playbook supports installing to a Raspberry Pi server, for at least some of the services.
 
 Since most ready-made container images do not support that architecture, we achieve this by building images locally on the device itself.
 See our [Self-building documentation page](docs/self-building.md) for how to get started.

From 22ce50875a9a5635b0b1771b6c66a35ed8fa88fe Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Sun, 15 Mar 2020 13:04:55 +0200
Subject: [PATCH 51/59] Mention that root access is a requirement

Fixes #396 (Github Issue).
---
 docs/prerequisites.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/prerequisites.md b/docs/prerequisites.md
index 4e72e2ead..e72b34969 100644
--- a/docs/prerequisites.md
+++ b/docs/prerequisites.md
@@ -2,6 +2,8 @@
 
 - An x86 server running **CentOS** (7 only for now; [8 is not yet supported](https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/300)), **Debian** (9/Stretch+) or **Ubuntu** (16.04+). This playbook doesn't support running on ARM ([see](https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/299)), however a minimal subset of the tools can be built on the host, which may result in a working configuration, even on a Raspberry pi (see [Self-Building](self-building.md)). We only strive to support released stable versions of distributions, not betas or pre-releases. This playbook can take over your whole server or co-exist with other services that you have there.
 
+- `root` access to your server (or a user capable of elevating to `root` via `sudo`).
+
 - [Python](https://www.python.org/) being installed on the server. Most distributions install Python by default, but some don't (e.g. Ubuntu 18.04) and require manual installation (something like `apt-get install python`).
 
 - a `cron`-like tool installed on the server such as `cron` or `anacron` to automatically schedule the Let's Encrypt SSL certificates's renewal. *This can be ignored if you use your own SSL certificates.*

From bfd87000cc0947efd2fe169f467b582b4201925a Mon Sep 17 00:00:00 2001
From: Dan Arnfield <dan@arnfield.com>
Date: Wed, 18 Mar 2020 06:40:01 -0500
Subject: [PATCH 52/59] Update riot-web (1.5.12 -> 1.5.13)

---
 roles/matrix-riot-web/defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/matrix-riot-web/defaults/main.yml b/roles/matrix-riot-web/defaults/main.yml
index 08b141a16..e0002326d 100644
--- a/roles/matrix-riot-web/defaults/main.yml
+++ b/roles/matrix-riot-web/defaults/main.yml
@@ -2,7 +2,7 @@ matrix_riot_web_enabled: true
 
 matrix_riot_web_container_image_self_build: false
 
-matrix_riot_web_docker_image: "vectorim/riot-web:v1.5.12"
+matrix_riot_web_docker_image: "vectorim/riot-web:v1.5.13"
 matrix_riot_web_docker_image_force_pull: "{{ matrix_riot_web_docker_image.endswith(':latest') }}"
 
 matrix_riot_web_data_path: "{{ matrix_base_data_path }}/riot-web"

From e36de7e627fdc3338b6f3d66f920d9d6d3b037e1 Mon Sep 17 00:00:00 2001
From: Dan Arnfield <dan@arnfield.com>
Date: Wed, 18 Mar 2020 06:50:51 -0500
Subject: [PATCH 53/59] Update postgres (12.1 -> 12.2, etc)

---
 roles/matrix-postgres/defaults/main.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/roles/matrix-postgres/defaults/main.yml b/roles/matrix-postgres/defaults/main.yml
index 91656ff6b..4089793a8 100644
--- a/roles/matrix-postgres/defaults/main.yml
+++ b/roles/matrix-postgres/defaults/main.yml
@@ -8,10 +8,10 @@ matrix_postgres_db_name: ""
 matrix_postgres_base_path: "{{ matrix_base_data_path }}/postgres"
 matrix_postgres_data_path: "{{ matrix_postgres_base_path }}/data"
 
-matrix_postgres_docker_image_v9: "postgres:9.6.16-alpine"
-matrix_postgres_docker_image_v10: "postgres:10.11-alpine"
-matrix_postgres_docker_image_v11: "postgres:11.6-alpine"
-matrix_postgres_docker_image_v12: "postgres:12.1-alpine"
+matrix_postgres_docker_image_v9: "postgres:9.6.17-alpine"
+matrix_postgres_docker_image_v10: "postgres:10.12-alpine"
+matrix_postgres_docker_image_v11: "postgres:11.7-alpine"
+matrix_postgres_docker_image_v12: "postgres:12.2-alpine"
 matrix_postgres_docker_image_latest: "{{ matrix_postgres_docker_image_v12 }}"
 
 # This variable is assigned at runtime. Overriding its value has no effect.

From 4065d74a5fc5ec97d4dfc6f4e5543615212a9576 Mon Sep 17 00:00:00 2001
From: Dan Arnfield <dan@arnfield.com>
Date: Wed, 18 Mar 2020 06:53:59 -0500
Subject: [PATCH 54/59] Update nginx (1.17.8 -> 1.17.9)

---
 roles/matrix-nginx-proxy/defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/matrix-nginx-proxy/defaults/main.yml b/roles/matrix-nginx-proxy/defaults/main.yml
index f9ebe4199..a14c13334 100644
--- a/roles/matrix-nginx-proxy/defaults/main.yml
+++ b/roles/matrix-nginx-proxy/defaults/main.yml
@@ -3,7 +3,7 @@ matrix_nginx_proxy_enabled: true
 # We use an official nginx image, which we fix-up to run unprivileged.
 # An alternative would be an `nginxinc/nginx-unprivileged` image, but
 # that is frequently out of date.
-matrix_nginx_proxy_docker_image: "nginx:1.17.8-alpine"
+matrix_nginx_proxy_docker_image: "nginx:1.17.9-alpine"
 matrix_nginx_proxy_docker_image_force_pull: "{{ matrix_nginx_proxy_docker_image.endswith(':latest') }}"
 
 matrix_nginx_proxy_base_path: "{{ matrix_base_data_path }}/nginx-proxy"

From c7440b723a0d1af1e0fbf16d6a9f9ec67e038004 Mon Sep 17 00:00:00 2001
From: Dan Arnfield <dan@arnfield.com>
Date: Wed, 18 Mar 2020 06:54:10 -0500
Subject: [PATCH 55/59] Update certbot (1.2.0 -> 1.3.0)

---
 roles/matrix-nginx-proxy/defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/matrix-nginx-proxy/defaults/main.yml b/roles/matrix-nginx-proxy/defaults/main.yml
index a14c13334..aeede0e2c 100644
--- a/roles/matrix-nginx-proxy/defaults/main.yml
+++ b/roles/matrix-nginx-proxy/defaults/main.yml
@@ -205,7 +205,7 @@ matrix_ssl_domains_to_obtain_certificates_for: []
 
 # Controls whether to obtain production or staging certificates from Let's Encrypt.
 matrix_ssl_lets_encrypt_staging: false
-matrix_ssl_lets_encrypt_certbot_docker_image: "certbot/certbot:v1.2.0"
+matrix_ssl_lets_encrypt_certbot_docker_image: "certbot/certbot:v1.3.0"
 matrix_ssl_lets_encrypt_certbot_docker_image_force_pull: "{{ matrix_ssl_lets_encrypt_certbot_docker_image.endswith(':latest') }}"
 matrix_ssl_lets_encrypt_certbot_standalone_http_port: 2402
 matrix_ssl_lets_encrypt_support_email: ~

From 027056e0273be8d260648e2472c28a0d4752b802 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Wed, 18 Mar 2020 18:24:03 +0200
Subject: [PATCH 56/59] Fix weird path creation

Fixes #403 (Github Issue).
---
 .../tasks/setup_install.yml                         | 11 ++++++-----
 .../tasks/setup_install.yml                         | 13 ++++++-------
 roles/matrix-coturn/tasks/setup_coturn.yml          |  6 +++---
 roles/matrix-mxisd/tasks/setup_mxisd.yml            | 10 +++++-----
 roles/matrix-riot-web/tasks/setup_riot_web.yml      |  8 ++++----
 roles/matrix-synapse/tasks/setup_synapse.yml        | 12 ++++++------
 6 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/roles/matrix-bridge-mautrix-facebook/tasks/setup_install.yml b/roles/matrix-bridge-mautrix-facebook/tasks/setup_install.yml
index 5a70c2e43..2656c5ae0 100644
--- a/roles/matrix-bridge-mautrix-facebook/tasks/setup_install.yml
+++ b/roles/matrix-bridge-mautrix-facebook/tasks/setup_install.yml
@@ -18,16 +18,17 @@
 
 - name: Ensure Mautrix Facebook paths exist
   file:
-    path: "{{ item }}"
+    path: "{{ item.path }}"
     state: directory
     mode: 0750
     owner: "{{ matrix_user_username }}"
     group: "{{ matrix_user_username }}"
   with_items:
-    - "{{ matrix_mautrix_facebook_base_path }}"
-    - "{{ matrix_mautrix_facebook_config_path }}"
-    - "{{ matrix_mautrix_facebook_data_path }}"
-    - { src: "{{ matrix_mautrix_facebook_docker_src_files_path }}", when: "{{ matrix_mautrix_facebook_container_image_self_build }}" }
+    - { path: "{{ matrix_mautrix_facebook_base_path }}", when: true }
+    - { path: "{{ matrix_mautrix_facebook_config_path }}", when: true }
+    - { path: "{{ matrix_mautrix_facebook_data_path }}", when: true }
+    - { path: "{{ matrix_mautrix_facebook_docker_src_files_path }}", when: "{{ matrix_mautrix_facebook_container_image_self_build }}" }
+  when: item.when|bool
 
 - name: Ensure Mautrix Facebook repository is present on self-build
   git:
diff --git a/roles/matrix-bridge-mautrix-hangouts/tasks/setup_install.yml b/roles/matrix-bridge-mautrix-hangouts/tasks/setup_install.yml
index db1fe736d..a30367f3d 100644
--- a/roles/matrix-bridge-mautrix-hangouts/tasks/setup_install.yml
+++ b/roles/matrix-bridge-mautrix-hangouts/tasks/setup_install.yml
@@ -18,18 +18,17 @@
 
 - name: Ensure Mautrix Hangouts paths exist
   file:
-    path: "{{ item }}"
+    path: "{{ item.path }}"
     state: directory
     mode: 0750
     owner: "{{ matrix_user_username }}"
     group: "{{ matrix_user_username }}"
   with_items:
-    - "{{ matrix_mautrix_hangouts_base_path }}"
-    - "{{ matrix_mautrix_hangouts_config_path }}"
-    - "{{ matrix_mautrix_hangouts_data_path }}"
-    - { src: "{{ matrix_mautrix_hangouts_docker_src_files_path }}", when: "{{ matrix_mautrix_hangouts_container_image_self_build }}" }
-
-  when: matrix_mautrix_hangouts_enabled|bool and not matrix_mautrix_hangouts_container_image_self_build
+    - { path: "{{ matrix_mautrix_hangouts_base_path }}", when: true }
+    - { path: "{{ matrix_mautrix_hangouts_config_path }}", when: true }
+    - { path: "{{ matrix_mautrix_hangouts_data_path }}", when: true }
+    - { path: "{{ matrix_mautrix_hangouts_docker_src_files_path }}", when: "{{ matrix_mautrix_hangouts_container_image_self_build }}" }
+  when: matrix_mautrix_hangouts_enabled|bool and item.when|bool
 
 - name: Ensure Mautrix Hangots repository is present on self build
   git:
diff --git a/roles/matrix-coturn/tasks/setup_coturn.yml b/roles/matrix-coturn/tasks/setup_coturn.yml
index d86e4b22f..479e60449 100644
--- a/roles/matrix-coturn/tasks/setup_coturn.yml
+++ b/roles/matrix-coturn/tasks/setup_coturn.yml
@@ -6,14 +6,14 @@
 
 - name: Ensure Matrix Coturn path exists
   file:
-    path: "{{ item }}"
+    path: "{{ item.path }}"
     state: directory
     mode: 0750
     owner: "{{ matrix_user_username }}"
     group: "{{ matrix_user_username }}"
   with_items:
-    - { src: "{{ matrix_coturn_docker_src_files_path }}", when: "{{ matrix_coturn_container_image_self_build }}"}
-  when: matrix_riot_web_enabled|bool
+    - { path: "{{ matrix_coturn_docker_src_files_path }}", when: "{{ matrix_coturn_container_image_self_build }}"}
+  when: matrix_riot_web_enabled|bool and item.when
 
 - name: Ensure Coturn image is pulled
   docker_image:
diff --git a/roles/matrix-mxisd/tasks/setup_mxisd.yml b/roles/matrix-mxisd/tasks/setup_mxisd.yml
index 27c00c70b..aa7801198 100644
--- a/roles/matrix-mxisd/tasks/setup_mxisd.yml
+++ b/roles/matrix-mxisd/tasks/setup_mxisd.yml
@@ -6,16 +6,16 @@
 
 - name: Ensure mxisd paths exist
   file:
-    path: "{{ item }}"
+    path: "{{ item.path }}"
     state: directory
     mode: 0750
     owner: "{{ matrix_user_username }}"
     group: "{{ matrix_user_username }}"
   with_items:
-    - "{{ matrix_mxisd_config_path }}"
-    - "{{ matrix_mxisd_data_path }}"
-    - { src: "{{ matrix_mxisd_docker_src_files_path }}", when: "{{ matrix_mxisd_container_image_self_build }}"}
-  when: matrix_mxisd_enabled|bool
+    - { path: "{{ matrix_mxisd_config_path }}", when: true }
+    - { path: "{{ matrix_mxisd_data_path }}", when: true }
+    - { path: "{{ matrix_mxisd_docker_src_files_path }}", when: "{{ matrix_mxisd_container_image_self_build }}"}
+  when: matrix_mxisd_enabled|bool and item.when
 
 - name: Ensure mxisd image is pulled
   docker_image:
diff --git a/roles/matrix-riot-web/tasks/setup_riot_web.yml b/roles/matrix-riot-web/tasks/setup_riot_web.yml
index feccbe816..e78da3502 100644
--- a/roles/matrix-riot-web/tasks/setup_riot_web.yml
+++ b/roles/matrix-riot-web/tasks/setup_riot_web.yml
@@ -6,15 +6,15 @@
 
 - name: Ensure Matrix riot-web path exists
   file:
-    path: "{{ item }}"
+    path: "{{ item.path }}"
     state: directory
     mode: 0750
     owner: "{{ matrix_user_username }}"
     group: "{{ matrix_user_username }}"
   with_items:
-    - "{{ matrix_riot_web_data_path }}"
-    - { src: "{{ matrix_riot_web_docker_src_files_path }}", when: "{{ matrix_riot_web_container_image_self_build }}" }
-  when: matrix_riot_web_enabled|bool
+    - { path: "{{ matrix_riot_web_data_path }}", when: true }
+    - { path: "{{ matrix_riot_web_docker_src_files_path }}", when: "{{ matrix_riot_web_container_image_self_build }}" }
+  when: matrix_riot_web_enabled|bool and item.when
 
 - name: Ensure riot-web Docker image is pulled
   docker_image:
diff --git a/roles/matrix-synapse/tasks/setup_synapse.yml b/roles/matrix-synapse/tasks/setup_synapse.yml
index 8d5f72d24..c40ae170b 100644
--- a/roles/matrix-synapse/tasks/setup_synapse.yml
+++ b/roles/matrix-synapse/tasks/setup_synapse.yml
@@ -2,20 +2,20 @@
 
 - name: Ensure Synapse paths exist
   file:
-    path: "{{ item }}"
+    path: "{{ item.path }}"
     state: directory
     mode: 0750
     owner: "{{ matrix_user_username }}"
     group: "{{ matrix_user_username }}"
   with_items:
-    - "{{ matrix_synapse_config_dir_path }}"
-    - "{{ matrix_synapse_run_path }}"
-    - "{{ matrix_synapse_ext_path }}"
-    - { src: "{{ matrix_synapse_docker_src_files_path }}", when: "{{ matrix_synapse_container_image_self_build }}" }
+    - { path: "{{ matrix_synapse_config_dir_path }}", when: true }
+    - { path: "{{ matrix_synapse_run_path }}", when: true }
+    - { path: "{{ matrix_synapse_ext_path }}", when: true }
+    - { path: "{{ matrix_synapse_docker_src_files_path }}", when: "{{ matrix_synapse_container_image_self_build }}" }
     # We handle matrix_synapse_media_store_path elsewhere (in ./synapse/setup_install.yml),
     # because if it's using Goofys and it's already mounted (from before),
     # trying to chown/chmod it here will cause trouble.
-  when: "matrix_synapse_enabled|bool or matrix_s3_media_store_enabled|bool"
+  when: "(matrix_synapse_enabled|bool or matrix_s3_media_store_enabled|bool) and item.when"
 
 - import_tasks: "{{ role_path }}/tasks/ext/setup.yml"
 

From 364742aa356a13304200e1ce6c0ff1c2d5950a9d Mon Sep 17 00:00:00 2001
From: ayounggun <alex.gunyon@gmail.com>
Date: Fri, 20 Mar 2020 20:45:53 +0000
Subject: [PATCH 57/59] how to activate dimensions

I am new to synapse. Thanks so much for these playbooks!

I wasn't sure how you actual activate dimensions after setting these variables. Should you re run

ansible-playbook -i inventory/hosts setup.yml --tags=setup-all
ansible-playbook -i inventory/hosts setup.yml --tags=start

? If so perhaps you could tell the readers to do this somewhere in the help file

Thanks =]
---
 docs/configuring-playbook-dimension.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/configuring-playbook-dimension.md b/docs/configuring-playbook-dimension.md
index 70aeabb2b..97ced6bd4 100644
--- a/docs/configuring-playbook-dimension.md
+++ b/docs/configuring-playbook-dimension.md
@@ -43,6 +43,13 @@ Add access token to your configuration file (`inventory/host_vars/matrix.<your-d
 matrix_dimension_access_token: "YOUR ACCESS TOKEN HERE"
 ```
 
+After these variables have been set, please run the following command to setup and start dimensions:
+
+```
+ansible-playbook -i inventory/hosts setup.yml --tags=setup-all
+ansible-playbook -i inventory/hosts setup.yml --tags=start
+```
+
 For more information on how to acquire an access token, visit [https://t2bot.io/docs/access_tokens](https://t2bot.io/docs/access_tokens).
 
 ## Additional features

From a5e549f171713177d02a5ae468cea67bb315fdfb Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Sat, 21 Mar 2020 00:12:26 +0200
Subject: [PATCH 58/59] Move things around a bit

---
 docs/configuring-playbook-dimension.md | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/docs/configuring-playbook-dimension.md b/docs/configuring-playbook-dimension.md
index 97ced6bd4..bfd3648a2 100644
--- a/docs/configuring-playbook-dimension.md
+++ b/docs/configuring-playbook-dimension.md
@@ -41,17 +41,16 @@ Add access token to your configuration file (`inventory/host_vars/matrix.<your-d
 
 ```yaml
 matrix_dimension_access_token: "YOUR ACCESS TOKEN HERE"
+
+For more information on how to acquire an access token, visit [https://t2bot.io/docs/access_tokens](https://t2bot.io/docs/access_tokens).
 ```
 
-After these variables have been set, please run the following command to setup and start dimensions:
+After these variables have been set, please run the following command to re-run setup and to restart Dimension:
 
 ```
-ansible-playbook -i inventory/hosts setup.yml --tags=setup-all
-ansible-playbook -i inventory/hosts setup.yml --tags=start
+ansible-playbook -i inventory/hosts setup.yml --tags=setup-all,start
 ```
 
-For more information on how to acquire an access token, visit [https://t2bot.io/docs/access_tokens](https://t2bot.io/docs/access_tokens).
-
 ## Additional features
 
 To use a more custom configuration, you can define a `matrix_dimension_configuration_extension_yaml` string variable and put your configuration in it.

From 61f82ac9e64acbcb64621d359754ac68c8828e2b Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Sat, 21 Mar 2020 00:13:31 +0200
Subject: [PATCH 59/59] Minor fixup

---
 docs/configuring-playbook-dimension.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/configuring-playbook-dimension.md b/docs/configuring-playbook-dimension.md
index bfd3648a2..99de20d65 100644
--- a/docs/configuring-playbook-dimension.md
+++ b/docs/configuring-playbook-dimension.md
@@ -41,9 +41,9 @@ Add access token to your configuration file (`inventory/host_vars/matrix.<your-d
 
 ```yaml
 matrix_dimension_access_token: "YOUR ACCESS TOKEN HERE"
+```
 
 For more information on how to acquire an access token, visit [https://t2bot.io/docs/access_tokens](https://t2bot.io/docs/access_tokens).
-```
 
 After these variables have been set, please run the following command to re-run setup and to restart Dimension: