update synapse to v1.3.0

this includes changes to the logging configuration

defaults/main.yml

@@ -7,7 +7,7 @@ matrix_synapse_secrets_path: "{{ matrix_synapse_base_path }}/secrets"
 matrix_synapse_dh_path: "{{ matrix_synapse_base_path }}/tls/{{ matrix_server_name }}.dh"
 matrix_synapse_baseurl: "https://{{ matrix_server_name }}"
 matrix_synapse_signing_key_path: "{{ matrix_synapse_base_path }}/tls/{{ matrix_server_name }}.signing.key"
-matrix_synapse_version: "v1.2.1"
+matrix_synapse_version: "v1.3.0"
 matrix_synapse_log_dir: "/var/log/matrix_synapse"
 matrix_synapse_log_days_keep: 30
 matrix_synapse_pid_file: "{{ matrix_synapse_base_path }}/synapse.pid"

tasks/configure.yml

@@ -59,8 +59,6 @@
 
 - name: Configure logging
   import_tasks: logging.yml
-  when: matrix_synapse_supervision_method == "systemd"
-  # TODO: Figure out how to make sure that logging ends up in rsyslog no matter what system we run on
 
 - name: Create certificates
   include_tasks: crypto.yml

tasks/deployment.yml

@@ -73,5 +73,6 @@
       - "{{ matrix_synapse_config.media_store_path }}:{{ matrix_synapse_config.media_store_path }}"
       - "{{ matrix_synapse_config.uploads_path }}:{{ matrix_synapse_config.uploads_path }}"
       - "{{ matrix_synapse_base_path }}/homeserver.yaml:{{ matrix_synapse_base_path }}/homeserver.yaml"
+      - "{{ matrix_synapse_base_path }}/log.config:{{ matrix_synapse_base_path }}/log.config"
       - "{{ matrix_synapse_base_path }}/tls:{{ matrix_synapse_base_path }}/tls"
   when: matrix_synapse_deployment_method == "docker"

tasks/logging.yml

@@ -1,23 +1,27 @@
 ---
-- name: create logging folder
-  file:
-    name: "{{ matrix_synapse_log_dir }}"
-    state: directory
-    owner: synapse
-    group: synapse
+- name: Logging config (systemd)
+  block:
+    - name: create logging folder
+      file:
+        name: "{{ matrix_synapse_log_dir }}"
+        state: directory
+        owner: synapse
+        group: synapse
 
-- name: copy syslog config
-  template:
-    src: syslog-synapse.conf.j2
-    dest: /etc/rsyslog.d/matrix_synapse.conf
-    owner: root
-  notify: restart rsyslog
+    - name: copy syslog config
+      template:
+        src: syslog-synapse.conf.j2
+        dest: /etc/rsyslog.d/matrix_synapse.conf
+        owner: root
+      notify: restart rsyslog
 
-- name: template logrotate config
-  template:
-    src: logrotate.j2
-    dest: /etc/logrotate.d/matrix_synapse
-    owner: root
+    - name: template logrotate config
+      template:
+        src: logrotate.j2
+        dest: /etc/logrotate.d/matrix_synapse
+        owner: root
+  when: matrix_synapse_supervision_method == "systemd"
+  # TODO: Figure out how to make sure that logging ends up in rsyslog no matter what system we run on
 
 - name: Deploy log config
   copy:

templates/matrix-synapse.service.j2

@@ -4,7 +4,7 @@ Description="Matrix Synapse Server (synapse)"
 [Service]
 Type=simple
 WorkingDirectory={{ matrix_synapse_base_path }}
-ExecStart={{ matrix_synapse_base_path }}/env/bin/python -m synapse.app.homeserver --config-path={{ matrix_synapse_base_path }}/homeserver.yaml --log-config={{ matrix_synapse_base_path }}/log.config
+ExecStart={{ matrix_synapse_base_path }}/env/bin/python -m synapse.app.homeserver --config-path={{ matrix_synapse_base_path }}/homeserver.yaml
 ExecStop={{ matrix_synapse_base_path }}/env/bin/synctl stop {{ matrix_synapse_base_path }}/homeserver.yaml
 User=synapse
 Group=synapse

vars/main.yml

@@ -49,6 +49,7 @@ matrix_synapse_base_config:
       host: "{{ matrix_synapse_pg_host }}"
       cp_min: 5
       cp_max: 10
+  log_config: "{{ matrix_synapse_base_path }}/log.config"
   event_cache_size: "10K"
   rc_messages_per_second: 0.2
   rc_message_burst_count: 10.0