Merge branch 'master' into feat/fix-log-dir

README.md

@@ -35,7 +35,7 @@ The following should be present on the target system
 | 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 }}/ssl/{{ matrix_server_name }}.signing.key" |
-| matrix_synapse_version | "v0.99.1.1" |
+| matrix_synapse_version | "v0.99.3" |
 | matrix_synapse_log_days_keep | 30 |
 | matrix_synapse_deployment_method | pip | Either pip or docker [¹](#footnote_1) |
 | matrix_synapse_supervision_method | systemd | Either systemd, runit or docker [¹](#footnote_1) |

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: "v0.99.2"
+matrix_synapse_version: "v0.99.3"
 matrix_synapse_log_dir: "/var/log/matrix_synapse"
 matrix_synapse_log_days_keep: 30
 matrix_synapse_skip_tls: false

tests/test-docker.yml

@@ -1,6 +1,23 @@
 ---
 - hosts: all
   become: true
+  tasks:
+    - name: Flush handlers
+      meta: flush_handlers
+
+    - name: Check if the api returns the correct version
+      uri:
+        url: "http://localhost:8008/_matrix/federation/v1/version"
+        return_content: true
+      register: api_version
+      until: api_version.status == 200
+      retries: 10
+      delay: 2
+
+    - name: Check returned api version
+      fail: >
+        Return value is not as expected {{ api_version }}
+      when: matrix_synapse_version != "v"~(api_version.content | from_json).server.version
   vars:
     dbname: synapse
     dbuser: synapse_user

tests/test-pip.yml

@@ -5,6 +5,23 @@
     dbname: synapse
     dbuser: synapse_user
     dbpw: synapse_password
+  tasks:
+    - name: Flush handlers
+      meta: flush_handlers
+
+    - name: Check if the api returns the correct version
+      uri:
+        url: "http://localhost:8008/_matrix/federation/v1/version"
+        return_content: true
+      register: api_version
+      until: api_version.status == 200
+      retries: 10
+      delay: 2
+
+    - name: Check returned api version
+      fail: >
+        Return value is not as expected {{ api_version }}
+      when: matrix_synapse_version != "v"~(api_version.content | from_json).server.version
   roles:
     - role: geerlingguy.pip
     - role: geerlingguy.postgresql