From 493062b00a721d100953cf97655ae5575ebc6132 Mon Sep 17 00:00:00 2001 From: Sam Al-Sapti Date: Sat, 8 Apr 2023 00:15:05 +0200 Subject: [PATCH] Upgrade Matrix (Synapse) to v1.80.0 --- roles/docker/defaults/main.yml | 4 ++-- .../files/configs/matrix/homeserver.yaml.j2 | 13 +++---------- roles/docker/tasks/services/matrix_riot.yml | 15 ++++++--------- 3 files changed, 11 insertions(+), 21 deletions(-) diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index 2152b60f..848f0058 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -95,8 +95,8 @@ services: file: matrix_riot.yml domain: "matrix.{{ base_domain }}" volume_folder: "{{ volume_root_folder }}/matrix" - version: v1.63.1 - postgres_version: "10" + version: v1.80.0 + postgres_version: 15-alpine allowed_sender_domain: true riot: diff --git a/roles/docker/files/configs/matrix/homeserver.yaml.j2 b/roles/docker/files/configs/matrix/homeserver.yaml.j2 index 73ba3f3e..b4749018 100644 --- a/roles/docker/files/configs/matrix/homeserver.yaml.j2 +++ b/roles/docker/files/configs/matrix/homeserver.yaml.j2 @@ -339,7 +339,7 @@ database: user: "synapse" password: "{{ postgres_passwords.matrix }}" database: "synapse" - host: "matrix_db" + host: "postgres" port: "5432" cp_min: 5 cp_max: 10 @@ -676,15 +676,8 @@ report_stats: false ## API Configuration ## -# A list of event types that will be included in the room_invite_state -# -room_invite_state_types: - - "m.room.join_rules" - - "m.room.canonical_alias" - - "m.room.avatar" - - "m.room.encryption" - - "m.room.name" - +room_prejoin_state: + disable_default_event_types: false # A list of application service config file to use # diff --git a/roles/docker/tasks/services/matrix_riot.yml b/roles/docker/tasks/services/matrix_riot.yml index 600d81c5..d24c4d8e 100644 --- a/roles/docker/tasks/services/matrix_riot.yml +++ b/roles/docker/tasks/services/matrix_riot.yml @@ -61,12 +61,11 @@ - name: set up matrix and riot docker_compose: project_name: matrix - pull: yes + pull: true definition: version: "3.6" services: - matrix_db: - container_name: matrix_db + postgres: image: "postgres:{{ services.matrix.postgres_version }}" restart: unless-stopped networks: @@ -77,8 +76,7 @@ POSTGRES_USER: "synapse" POSTGRES_PASSWORD: "{{ postgres_passwords.matrix }}" - matrix_app: - container_name: matrix + synapse: image: "matrixdotorg/synapse:{{ services.matrix.version }}" restart: unless-stopped networks: @@ -95,8 +93,7 @@ LETSENCRYPT_HOST: "{{ services.matrix.domain }}" LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" - riot: - container_name: riot_app + element: image: "avhost/docker-matrix-riot:{{ services.riot.version }}" restart: unless-stopped networks: @@ -107,9 +104,9 @@ volumes: - "{{ services.riot.volume_folder }}/data:/data" environment: - VIRTUAL_HOST: "{{ services.riot.domains|join(',') }}" + VIRTUAL_HOST: "{{ services.riot.domains | join(',') }}" VIRTUAL_PORT: "8080" - LETSENCRYPT_HOST: "{{ services.riot.domains|join(',') }}" + LETSENCRYPT_HOST: "{{ services.riot.domains | join(',') }}" LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" networks: