Merge branch 'master' of https://github.com/spantaleev/matrix-docker-ansible-deploy

roles/matrix-mailer/defaults/main.yml

@@ -2,7 +2,7 @@ matrix_mailer_enabled: true
 
 matrix_mailer_base_path: "{{ matrix_base_data_path }}/mailer"
 
-matrix_mailer_docker_image: "devture/exim-relay:4.91-r1-0"
+matrix_mailer_docker_image: "devture/exim-relay:4.91-r3-0"
 
 # The user/group that the container runs with.
 # These match the `exim` user/group within the container image.

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
 # those as more frequently out of date.
-matrix_nginx_proxy_docker_image: "nginx:1.15.10-alpine"
+matrix_nginx_proxy_docker_image: "nginx:1.15.12-alpine"
 
 matrix_nginx_proxy_base_path: "{{ matrix_base_data_path }}/nginx-proxy"
 matrix_nginx_proxy_data_path: "{{ matrix_nginx_proxy_base_path }}/data"

roles/matrix-riot-web/defaults/main.yml

@@ -1,6 +1,6 @@
 matrix_riot_web_enabled: true
 
-matrix_riot_web_docker_image: "bubuntux/riot-web:v1.0.7"
+matrix_riot_web_docker_image: "bubuntux/riot-web:v1.0.8"
 
 matrix_riot_web_data_path: "{{ matrix_base_data_path }}/riot-web"
 

roles/matrix-synapse/defaults/main.yml

@@ -119,26 +119,26 @@ matrix_synapse_auto_join_rooms: []
 # automatically if they don't already exist.
 matrix_synapse_autocreate_auto_join_rooms: true
 
-# Controls password-peppering for Matrix Synapse. Not to be changed after initial setup.
+# Controls password-peppering for Synapse. Not to be changed after initial setup.
 matrix_synapse_password_config_pepper: ""
 
-# Controls the number of events that Matrix Synapse caches in memory.
+# Controls the number of events that Synapse caches in memory.
 matrix_synapse_event_cache_size: "100K"
 
-# Controls cache sizes for Matrix Synapse via the SYNAPSE_CACHE_FACTOR environment variable.
+# Controls cache sizes for Synapse via the SYNAPSE_CACHE_FACTOR environment variable.
 # Raise this to increase cache sizes or lower it to potentially lower memory use.
 # To learn more, see:
 # - https://github.com/matrix-org/synapse#help-synapse-eats-all-my-ram
 # - https://github.com/matrix-org/synapse/issues/3939
 matrix_synapse_cache_factor: 0.5
 
-# Controls whether Matrix Synapse will federate at all.
+# Controls whether Synapse will federate at all.
 # Disable this to completely isolate your server from the rest of the Matrix network.
 # Also see: `matrix_synapse_tls_federation_listener_enabled` if you wish to keep federation enabled,
 # but want to stop the TLS listener (port 8448).
 matrix_synapse_federation_enabled: true
 
-# A list of domain names that are allowed to federate with the given Matrix Synapse server.
+# A list of domain names that are allowed to federate with the given Synapse server.
 # An empty list value (`[]`) will also effectively stop federation, but if that's the desired
 # result, it's better to accomplish it by changing `matrix_synapse_federation_enabled`.
 matrix_synapse_federation_domain_whitelist: ~

roles/matrix-synapse/tasks/import_media_store.yml

@@ -73,7 +73,7 @@
 # We don't chown for Goofys, because due to the way it's mounted,
 # all files become owned by whoever needs to own them.
 
-- name: Ensure Matrix Synapse is started (if it previously was)
+- name: Ensure Synapse is started (if it previously was)
   service:
     name: "{{ item }}"
     state: started

roles/matrix-synapse/tasks/register_user.yml

@@ -22,7 +22,7 @@
     daemon_reload: yes
   register: start_result
 
-- name: Wait a while, so that Matrix Synapse can manage to start
+- name: Wait a while, so that Synapse can manage to start
   pause:
     seconds: 7
   when: start_result.changed

roles/matrix-synapse/tasks/setup_synapse_main.yml

@@ -1,7 +1,7 @@
 ---
 
 # This will throw a Permission Denied error if already mounted using fuse
-- name: Check Matrix Synapse media store path
+- name: Check Synapse media store path
   stat:
     path: "{{ matrix_synapse_media_store_path }}"
   register: local_path_media_store_stat
@@ -9,7 +9,7 @@
 
 # This is separate and conditional, to ensure we don't execute it
 # if the path already exists or we failed to check, because it's mounted using fuse.
-- name: Ensure Matrix media store path exists
+- name: Ensure Synapse media store path exists
   file:
     path: "{{ matrix_synapse_media_store_path }}"
     state: directory
@@ -18,21 +18,23 @@
     group: "{{ matrix_user_username }}"
   when: "not local_path_media_store_stat.failed and not local_path_media_store_stat.stat.exists"
 
-- name: Ensure Matrix Docker image is pulled
+- name: Ensure Synapse Docker image is pulled
   docker_image:
     name: "{{ matrix_synapse_docker_image }}"
 
-- name: Check if a Matrix Synapse configuration exists
+- name: Check if a Synapse signing key exists
   stat:
-    path: "{{ matrix_synapse_config_dir_path }}/homeserver.yaml"
-  register: matrix_synapse_config_stat
+    path: "{{ matrix_synapse_config_dir_path }}/{{ matrix_server_fqn_matrix }}.signing.key"
+  register: matrix_synapse_signing_key_stat
 
-# We do this mostly so that the keys would get generated.
-# We'll replace the rest of the configuration with our own templates below.
+# We do this so that the signing key would get generated.
+#
+# This will also generate a default homeserver.yaml configuration file and a log configuration file.
+# We don't care about those configuraiton files, as we replace them with our own anyway (see below).
 #
 # We don't use the `docker_container` module, because using it with `cap_drop` requires
 # a very recent version, which is not available for a lot of people yet.
-- name: Generate initial Matrix config
+- name: Generate initial Synapse config and signing key
   command: |
     docker run
     --rm
@@ -45,15 +47,15 @@
     -e SYNAPSE_REPORT_STATS=no
     {{ matrix_synapse_docker_image }}
     generate
-  when: "not matrix_synapse_config_stat.stat.exists"
+  when: "not matrix_synapse_signing_key_stat.stat.exists"
 
-- name: Ensure Matrix homeserver config installed
+- name: Ensure Synapse homeserver config installed
   template:
     src: "{{ matrix_synapse_template_synapse_homeserver }}"
     dest: "{{ matrix_synapse_config_dir_path }}/homeserver.yaml"
     mode: 0644
 
-- name: Ensure Matrix log config installed
+- name: Ensure Synapse log config installed
   template:
     src: "{{ matrix_synapse_template_synapse_log }}"
     dest: "{{ matrix_synapse_config_dir_path }}/{{ matrix_server_fqn_matrix }}.log.config"

roles/matrix-synapse/tasks/setup_synapse_pre.yml

@@ -4,7 +4,7 @@
     matrix_synapse_media_store_parent_path: "{{ matrix_synapse_media_store_path|dirname }}"
     matrix_synapse_media_store_directory_name: "{{ matrix_synapse_media_store_path|basename }}"
 
-- name: Ensure Matrix Synapse paths exist
+- name: Ensure Synapse paths exist
   file:
     path: "{{ item }}"
     state: directory
@@ -17,4 +17,4 @@
     - "{{ matrix_synapse_ext_path }}"
     # We handle matrix_synapse_media_store_path elsewhere (in setup_synapse_main.yml),
     # because if it's using Goofys and it's already mounted (from before),
-    # trying to chown/chmod it here will cause trouble.
+    # trying to chown/chmod it here will cause trouble.

roles/matrix-synapse/templates/synapse/systemd/matrix-synapse.service.j2

@@ -1,5 +1,5 @@
 [Unit]
-Description=Matrix Synapse server
+Description=Synapse server
 {% for service in matrix_synapse_systemd_required_services_list %}
 Requires={{ service }}
 After={{ service }}