From 45fe0408ba5ee51f1343051da03f5ce6d925ad48 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Sat, 6 Apr 2024 10:05:07 +0300 Subject: [PATCH 01/69] Upgrade container-socket-proxy (v0.1.1-3 -> v0.1.2-0) --- requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.yml b/requirements.yml index f33c35b1c..ea840461c 100644 --- a/requirements.yml +++ b/requirements.yml @@ -7,7 +7,7 @@ version: v1.2.8-1.8.9-0 name: backup_borg - src: git+https://github.com/devture/com.devture.ansible.role.container_socket_proxy.git - version: v0.1.1-3 + version: v0.1.2-0 name: container_socket_proxy - src: git+https://github.com/geerlingguy/ansible-role-docker version: 7.1.0 From 3cfc8a423cdb887bdeb8762dda71a1dfa48bf58a Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Sat, 6 Apr 2024 10:11:57 +0300 Subject: [PATCH 02/69] Upgrade container-socket-proxy (v0.1.2-0 -> v0.1.2-1) --- requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.yml b/requirements.yml index ea840461c..3d4b6b94b 100644 --- a/requirements.yml +++ b/requirements.yml @@ -7,7 +7,7 @@ version: v1.2.8-1.8.9-0 name: backup_borg - src: git+https://github.com/devture/com.devture.ansible.role.container_socket_proxy.git - version: v0.1.2-0 + version: v0.1.2-1 name: container_socket_proxy - src: git+https://github.com/geerlingguy/ansible-role-docker version: 7.1.0 From 0c25bf02425624db9932934de7f05116f71d4677 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Sun, 7 Apr 2024 09:32:48 +0300 Subject: [PATCH 03/69] Upgrade exim-relay (v4.97-r0-0-3 -> v4.97.1-r0-0-0) --- requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.yml b/requirements.yml index 3d4b6b94b..a4dbc40dd 100644 --- a/requirements.yml +++ b/requirements.yml @@ -19,7 +19,7 @@ version: v2.0.1-2 name: etherpad - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-exim-relay.git - version: v4.97-r0-0-3 + version: v4.97.1-r0-0-0 name: exim_relay - src: git+https://gitlab.com/etke.cc/roles/grafana.git version: v10.4.1-0 From d7fbec3e2a3e1e4a4b57c084a6e0f835be17626d Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Sun, 7 Apr 2024 23:22:21 +0300 Subject: [PATCH 04/69] Upgrade exim-relay (v4.97.1-r0-0-0 -> v4.97.1-r0-0-1) --- requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.yml b/requirements.yml index a4dbc40dd..330207f9f 100644 --- a/requirements.yml +++ b/requirements.yml @@ -19,7 +19,7 @@ version: v2.0.1-2 name: etherpad - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-exim-relay.git - version: v4.97.1-r0-0-0 + version: v4.97.1-r0-0-1 name: exim_relay - src: git+https://gitlab.com/etke.cc/roles/grafana.git version: v10.4.1-0 From 80ce28405cbb7a9daedc83dd9c7d89ea99b7f688 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Mon, 8 Apr 2024 08:02:55 +0300 Subject: [PATCH 05/69] Restore missing wiring between matrix_dendrite_container_extra_arguments_auto and matrix_homeserver_container_extra_arguments_auto I believe this wiring had gotten lost at some point before. Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/3199 --- group_vars/matrix_servers | 1 + 1 file changed, 1 insertion(+) diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers index aa507a6e2..1ef7cdbdc 100755 --- a/group_vars/matrix_servers +++ b/group_vars/matrix_servers @@ -4975,6 +4975,7 @@ matrix_dendrite_systemd_wanted_services_list_auto: | (['matrix-coturn.service'] if matrix_coturn_enabled else []) }} +matrix_dendrite_container_extra_arguments_auto: "{{ matrix_homeserver_container_extra_arguments_auto }}" matrix_dendrite_app_service_config_files_auto: "{{ matrix_homeserver_app_service_config_files_auto }}" ###################################################################### From 0afc4f14272190432cceeb5881f32986daa828ea Mon Sep 17 00:00:00 2001 From: Samuel Meenzen Date: Tue, 9 Apr 2024 09:22:45 +0200 Subject: [PATCH 06/69] chore: fix nix flake (#3259) --- .gitignore | 2 +- flake.lock | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ flake.nix | 45 ++++++++++++++++++++++++---------------- 3 files changed, 89 insertions(+), 18 deletions(-) create mode 100644 flake.lock diff --git a/.gitignore b/.gitignore index 380d0fa41..42e31f650 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ .DS_Store .python-version .idea/ -flake.lock +.direnv/ # ignore roles pulled by ansible-galaxy /roles/galaxy/* diff --git a/flake.lock b/flake.lock new file mode 100644 index 000000000..b4d9ebdb9 --- /dev/null +++ b/flake.lock @@ -0,0 +1,60 @@ +{ + "nodes": { + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1712578459, + "narHash": "sha256-r+rjtYIdwV7mEqFwbvaS7dZSH+3xNW9loR3Rh9C0ifI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b1a486be09c354e25a18689eb21425e43892e38c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix index 412309a89..3738e97db 100644 --- a/flake.nix +++ b/flake.nix @@ -1,19 +1,30 @@ { - inputs.nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - - outputs = { self, nixpkgs, ... }: - let - pkgs = import nixpkgs { system = "x86_64-linux"; }; - in - { - devShell.x86_64-linux = pkgs.mkShell { - buildInputs = with pkgs; [ - just - python311Packages.ansible-core - python311Packages.passlib - ]; - LC_ALL = "C.UTF-8"; - LC_CTYPE = "C.UTF-8"; - }; - }; + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs"; + flake-utils.url = "github:numtide/flake-utils"; + }; + outputs = { + self, + nixpkgs, + flake-utils, + }: + flake-utils.lib.eachDefaultSystem + ( + system: let + pkgs = import nixpkgs { + inherit system; + }; + in + with pkgs; { + devShells.default = mkShell { + buildInputs = [ + just + ansible + ]; + shellHook = '' + echo "$(ansible --version)" + ''; + }; + } + ); } From 0742d348b0cb49f08f9b434354ae9a3a331303e4 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Tue, 9 Apr 2024 14:03:48 +0300 Subject: [PATCH 07/69] Upgrade Element (v1.11.63 -> v1.11.64) --- roles/custom/matrix-client-element/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/custom/matrix-client-element/defaults/main.yml b/roles/custom/matrix-client-element/defaults/main.yml index 506f07f83..039bb73b3 100644 --- a/roles/custom/matrix-client-element/defaults/main.yml +++ b/roles/custom/matrix-client-element/defaults/main.yml @@ -11,7 +11,7 @@ matrix_client_element_container_image_self_build_repo: "https://github.com/eleme matrix_client_element_container_image_self_build_low_memory_system_patch_enabled: "{{ ansible_memtotal_mb < 4096 }}" # renovate: datasource=docker depName=vectorim/element-web -matrix_client_element_version: v1.11.63 +matrix_client_element_version: v1.11.64 matrix_client_element_docker_image: "{{ matrix_client_element_docker_image_name_prefix }}vectorim/element-web:{{ matrix_client_element_version }}" matrix_client_element_docker_image_name_prefix: "{{ 'localhost/' if matrix_client_element_container_image_self_build else matrix_container_global_registry_prefix }}" From b63918813ec4b83f099a3979220336e460ed3942 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 9 Apr 2024 12:00:05 +0000 Subject: [PATCH 08/69] chore(deps): update matrixdotorg/dendrite-monolith docker tag to v0.13.7 --- roles/custom/matrix-dendrite/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/custom/matrix-dendrite/defaults/main.yml b/roles/custom/matrix-dendrite/defaults/main.yml index 944d64858..356860a04 100644 --- a/roles/custom/matrix-dendrite/defaults/main.yml +++ b/roles/custom/matrix-dendrite/defaults/main.yml @@ -13,7 +13,7 @@ matrix_dendrite_docker_image_path: "matrixdotorg/dendrite-monolith" matrix_dendrite_docker_image: "{{ matrix_dendrite_docker_image_name_prefix }}{{ matrix_dendrite_docker_image_path }}:{{ matrix_dendrite_docker_image_tag }}" matrix_dendrite_docker_image_name_prefix: "{{ 'localhost/' if matrix_dendrite_container_image_self_build else matrix_container_global_registry_prefix }}" # renovate: datasource=docker depName=matrixdotorg/dendrite-monolith -matrix_dendrite_docker_image_tag: "v0.13.6" +matrix_dendrite_docker_image_tag: "v0.13.7" matrix_dendrite_docker_image_force_pull: "{{ matrix_dendrite_docker_image.endswith(':latest') }}" matrix_dendrite_base_path: "{{ matrix_base_data_path }}/dendrite" From a57b38dc259d3a107c0c2cc2ae8d4f779e3d23d0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 9 Apr 2024 19:56:18 +0000 Subject: [PATCH 09/69] chore(deps): update matrixdotorg/sygnal docker tag to v0.14.1 --- roles/custom/matrix-sygnal/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/custom/matrix-sygnal/defaults/main.yml b/roles/custom/matrix-sygnal/defaults/main.yml index a365f2951..b2e391ce8 100644 --- a/roles/custom/matrix-sygnal/defaults/main.yml +++ b/roles/custom/matrix-sygnal/defaults/main.yml @@ -13,7 +13,7 @@ matrix_sygnal_hostname: '' matrix_sygnal_path_prefix: / # renovate: datasource=docker depName=matrixdotorg/sygnal -matrix_sygnal_version: v0.14.0 +matrix_sygnal_version: v0.14.1 matrix_sygnal_base_path: "{{ matrix_base_data_path }}/sygnal" matrix_sygnal_config_path: "{{ matrix_sygnal_base_path }}/config" From f8f922967642254d42fa9e1e9c4a36d6299d1cd6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 11 Apr 2024 21:16:21 +0000 Subject: [PATCH 10/69] chore(deps): update dependency grafana to v10.4.2-0 --- requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.yml b/requirements.yml index 330207f9f..465a13490 100644 --- a/requirements.yml +++ b/requirements.yml @@ -22,7 +22,7 @@ version: v4.97.1-r0-0-1 name: exim_relay - src: git+https://gitlab.com/etke.cc/roles/grafana.git - version: v10.4.1-0 + version: v10.4.2-0 name: grafana - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-jitsi.git version: v9364-1 From 4cf447ef8d58edf6d7f405fb0e44ac144aafda94 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 11 Apr 2024 21:16:26 +0000 Subject: [PATCH 11/69] chore(deps): update dependency prometheus to v2.51.2-0 --- requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.yml b/requirements.yml index 330207f9f..01a022a4c 100644 --- a/requirements.yml +++ b/requirements.yml @@ -49,7 +49,7 @@ version: 046004a8cb9946979b72ce81c2526c8033ea8067 name: postgres_backup - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-prometheus.git - version: v2.51.0-0 + version: v2.51.2-0 name: prometheus - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-prometheus-node-exporter.git version: v1.7.0-3 From 9d647a73626d58031651221354ba8313fe037bcd Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Fri, 12 Apr 2024 09:27:34 +0300 Subject: [PATCH 12/69] Upgrade Traefik (v2.11.0-4 -> v2.11.2-0) --- requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.yml b/requirements.yml index 3a54f447a..4697383fd 100644 --- a/requirements.yml +++ b/requirements.yml @@ -70,7 +70,7 @@ version: v1.0.0-0 name: timesync - src: git+https://github.com/devture/com.devture.ansible.role.traefik.git - version: v2.11.0-4 + version: v2.11.2-0 name: traefik - src: git+https://github.com/devture/com.devture.ansible.role.traefik_certs_dumper.git version: v2.8.3-1 From c89e437579cb4738e9b90c3be61a43808d100651 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Sat, 13 Apr 2024 09:50:19 +0300 Subject: [PATCH 13/69] Upgrade synapse-auto-compressor (v0.1.3 -> v0.1.4) This also removes the condition that made it use `latest` when self-building is enabled. v0.1.4 is expected to build correctly now, given that this issue is fixed: https://github.com/matrix-org/rust-synapse-compress-state/issues/134 --- roles/custom/matrix-synapse-auto-compressor/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/custom/matrix-synapse-auto-compressor/defaults/main.yml b/roles/custom/matrix-synapse-auto-compressor/defaults/main.yml index 20f52008b..347d9eecb 100644 --- a/roles/custom/matrix-synapse-auto-compressor/defaults/main.yml +++ b/roles/custom/matrix-synapse-auto-compressor/defaults/main.yml @@ -6,7 +6,7 @@ matrix_synapse_auto_compressor_enabled: true # renovate: datasource=docker depName=registry.gitlab.com/etke.cc/rust-synapse-compress-state -matrix_synapse_auto_compressor_version: "{{ 'latest' if matrix_synapse_auto_compressor_container_image_self_build else 'v0.1.3' }}" +matrix_synapse_auto_compressor_version: v0.1.4 matrix_synapse_auto_compressor_base_path: "{{ matrix_base_data_path }}/synapse-auto-compressor" matrix_synapse_auto_compressor_container_src_files_path: "{{ matrix_synapse_auto_compressor_base_path }}/container-src" From 88609a59b126deeb15ec9752680751a381f4e988 Mon Sep 17 00:00:00 2001 From: cksit Date: Sun, 14 Apr 2024 18:12:32 +1000 Subject: [PATCH 14/69] Fixed the docker cmd for generating Synapse config --- roles/custom/matrix-synapse/tasks/synapse/setup_install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/custom/matrix-synapse/tasks/synapse/setup_install.yml b/roles/custom/matrix-synapse/tasks/synapse/setup_install.yml index 736493280..c22e9d04a 100644 --- a/roles/custom/matrix-synapse/tasks/synapse/setup_install.yml +++ b/roles/custom/matrix-synapse/tasks/synapse/setup_install.yml @@ -94,7 +94,7 @@ - name: Generate initial Synapse config and signing key ansible.builtin.command: cmd: | - docker run + {{ devture_systemd_docker_base_host_command_docker }} run --rm --name=matrix-config --user={{ matrix_synapse_uid }}:{{ matrix_synapse_gid }} From 858b300a5abbae14c1e6c66562ef398f23700201 Mon Sep 17 00:00:00 2001 From: Aine Date: Tue, 16 Apr 2024 10:20:25 +0300 Subject: [PATCH 15/69] exim-relay: fix dkim permissions, fix sender address --- group_vars/matrix_servers | 2 +- requirements.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers index 1ef7cdbdc..d6afb580e 100755 --- a/group_vars/matrix_servers +++ b/group_vars/matrix_servers @@ -3364,7 +3364,7 @@ exim_relay_container_image_self_build: "{{ matrix_architecture not in ['amd64', exim_relay_hostname: "{{ matrix_server_fqn_matrix }}" -exim_relay_sender_address: "matrix@{{ matrix_domain }}" +exim_relay_sender_address: "matrix@{{ exim_relay_hostname }}" ######################################################################## # # diff --git a/requirements.yml b/requirements.yml index 4697383fd..ca6b150f3 100644 --- a/requirements.yml +++ b/requirements.yml @@ -19,7 +19,7 @@ version: v2.0.1-2 name: etherpad - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-exim-relay.git - version: v4.97.1-r0-0-1 + version: v4.97.1-r0-0-2 name: exim_relay - src: git+https://gitlab.com/etke.cc/roles/grafana.git version: v10.4.2-0 From e1135b15e876d2065ee26ff6d7830f3c9b7ac08e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 16 Apr 2024 11:51:10 +0000 Subject: [PATCH 16/69] chore(deps): update dock.mau.dev/mautrix/whatsapp docker tag to v0.10.7 --- roles/custom/matrix-bridge-mautrix-whatsapp/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/custom/matrix-bridge-mautrix-whatsapp/defaults/main.yml b/roles/custom/matrix-bridge-mautrix-whatsapp/defaults/main.yml index fdbe6145c..1be65f4a9 100644 --- a/roles/custom/matrix-bridge-mautrix-whatsapp/defaults/main.yml +++ b/roles/custom/matrix-bridge-mautrix-whatsapp/defaults/main.yml @@ -9,7 +9,7 @@ matrix_mautrix_whatsapp_container_image_self_build_repo: "https://mau.dev/mautri matrix_mautrix_whatsapp_container_image_self_build_branch: "{{ 'master' if matrix_mautrix_whatsapp_version == 'latest' else matrix_mautrix_whatsapp_version }}" # renovate: datasource=docker depName=dock.mau.dev/mautrix/whatsapp -matrix_mautrix_whatsapp_version: v0.10.6 +matrix_mautrix_whatsapp_version: v0.10.7 # See: https://mau.dev/mautrix/whatsapp/container_registry matrix_mautrix_whatsapp_docker_image: "{{ matrix_mautrix_whatsapp_docker_image_name_prefix }}mautrix/whatsapp:{{ matrix_mautrix_whatsapp_version }}" From 951c06ebb5e7911997845b0ea43a594934ef8cc7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 16 Apr 2024 11:51:14 +0000 Subject: [PATCH 17/69] chore(deps): update dock.mau.dev/mautrix/gmessages docker tag to v0.4.0 --- roles/custom/matrix-bridge-mautrix-gmessages/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/custom/matrix-bridge-mautrix-gmessages/defaults/main.yml b/roles/custom/matrix-bridge-mautrix-gmessages/defaults/main.yml index e44ca39cd..2088d2bea 100644 --- a/roles/custom/matrix-bridge-mautrix-gmessages/defaults/main.yml +++ b/roles/custom/matrix-bridge-mautrix-gmessages/defaults/main.yml @@ -9,7 +9,7 @@ matrix_mautrix_gmessages_container_image_self_build_repo: "https://github.com/ma matrix_mautrix_gmessages_container_image_self_build_branch: "{{ 'main' if matrix_mautrix_gmessages_version == 'latest' else matrix_mautrix_gmessages_version }}" # renovate: datasource=docker depName=dock.mau.dev/mautrix/gmessages -matrix_mautrix_gmessages_version: v0.3.0 +matrix_mautrix_gmessages_version: v0.4.0 # See: https://mau.dev/mautrix/gmessages/container_registry matrix_mautrix_gmessages_docker_image: "{{ matrix_mautrix_gmessages_docker_image_name_prefix }}mautrix/gmessages:{{ matrix_mautrix_gmessages_version }}" From 2d1593f500db5ea0020753bd1490e3f599589c87 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 16 Apr 2024 13:27:21 +0000 Subject: [PATCH 18/69] chore(deps): update dock.mau.dev/mautrix/meta docker tag to v0.3.0 --- .../matrix-bridge-mautrix-meta-instagram/defaults/main.yml | 2 +- .../matrix-bridge-mautrix-meta-messenger/defaults/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/custom/matrix-bridge-mautrix-meta-instagram/defaults/main.yml b/roles/custom/matrix-bridge-mautrix-meta-instagram/defaults/main.yml index 4079143e4..97d043736 100644 --- a/roles/custom/matrix-bridge-mautrix-meta-instagram/defaults/main.yml +++ b/roles/custom/matrix-bridge-mautrix-meta-instagram/defaults/main.yml @@ -13,7 +13,7 @@ matrix_mautrix_meta_instagram_enabled: true matrix_mautrix_meta_instagram_identifier: matrix-mautrix-meta-instagram # renovate: datasource=docker depName=dock.mau.dev/mautrix/meta -matrix_mautrix_meta_instagram_version: v0.2.0 +matrix_mautrix_meta_instagram_version: v0.3.0 matrix_mautrix_meta_instagram_base_path: "{{ matrix_base_data_path }}/mautrix-meta-instagram" matrix_mautrix_meta_instagram_config_path: "{{ matrix_mautrix_meta_instagram_base_path }}/config" diff --git a/roles/custom/matrix-bridge-mautrix-meta-messenger/defaults/main.yml b/roles/custom/matrix-bridge-mautrix-meta-messenger/defaults/main.yml index 7a9cd2f80..f5bc46bdd 100644 --- a/roles/custom/matrix-bridge-mautrix-meta-messenger/defaults/main.yml +++ b/roles/custom/matrix-bridge-mautrix-meta-messenger/defaults/main.yml @@ -13,7 +13,7 @@ matrix_mautrix_meta_messenger_enabled: true matrix_mautrix_meta_messenger_identifier: matrix-mautrix-meta-messenger # renovate: datasource=docker depName=dock.mau.dev/mautrix/meta -matrix_mautrix_meta_messenger_version: v0.2.0 +matrix_mautrix_meta_messenger_version: v0.3.0 matrix_mautrix_meta_messenger_base_path: "{{ matrix_base_data_path }}/mautrix-meta-messenger" matrix_mautrix_meta_messenger_config_path: "{{ matrix_mautrix_meta_messenger_base_path }}/config" From d8904eb36caab3fd142cfe6e9dcab2cccb846404 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 16 Apr 2024 13:27:26 +0000 Subject: [PATCH 19/69] chore(deps): update dock.mau.dev/mautrix/signal docker tag to v0.6.0 --- roles/custom/matrix-bridge-mautrix-signal/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/custom/matrix-bridge-mautrix-signal/defaults/main.yml b/roles/custom/matrix-bridge-mautrix-signal/defaults/main.yml index 4e11de2da..ebb048521 100644 --- a/roles/custom/matrix-bridge-mautrix-signal/defaults/main.yml +++ b/roles/custom/matrix-bridge-mautrix-signal/defaults/main.yml @@ -9,7 +9,7 @@ matrix_mautrix_signal_container_image_self_build_repo: "https://mau.dev/mautrix/ matrix_mautrix_signal_container_image_self_build_branch: "{{ 'main' if matrix_mautrix_signal_version == 'latest' else matrix_mautrix_signal_version }}" # renovate: datasource=docker depName=dock.mau.dev/mautrix/signal -matrix_mautrix_signal_version: v0.5.1 +matrix_mautrix_signal_version: v0.6.0 # See: https://mau.dev/mautrix/signal/container_registry matrix_mautrix_signal_docker_image: "{{ matrix_mautrix_signal_docker_image_name_prefix }}mautrix/signal:{{ matrix_mautrix_signal_docker_image_tag }}" From 2a546a1e071ded7bb97242a0e43d79917a941015 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 16 Apr 2024 16:13:53 +0000 Subject: [PATCH 20/69] chore(deps): update ghcr.io/element-hq/synapse docker tag to v1.105.0 --- roles/custom/matrix-synapse/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/custom/matrix-synapse/defaults/main.yml b/roles/custom/matrix-synapse/defaults/main.yml index c9499207a..3339f55df 100644 --- a/roles/custom/matrix-synapse/defaults/main.yml +++ b/roles/custom/matrix-synapse/defaults/main.yml @@ -16,7 +16,7 @@ matrix_synapse_enabled: true matrix_synapse_github_org_and_repo: element-hq/synapse # renovate: datasource=docker depName=ghcr.io/element-hq/synapse -matrix_synapse_version: v1.104.0 +matrix_synapse_version: v1.105.0 matrix_synapse_username: '' matrix_synapse_uid: '' From b9de0aa64e67a8b3d8bcc8645f25ce3234e8ee68 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 17 Apr 2024 11:50:47 +0000 Subject: [PATCH 21/69] chore(deps): update registry.gitlab.com/etke.cc/buscarron docker tag to v1.4.1 --- roles/custom/matrix-bot-buscarron/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/custom/matrix-bot-buscarron/defaults/main.yml b/roles/custom/matrix-bot-buscarron/defaults/main.yml index 116155cef..a10974754 100644 --- a/roles/custom/matrix-bot-buscarron/defaults/main.yml +++ b/roles/custom/matrix-bot-buscarron/defaults/main.yml @@ -6,7 +6,7 @@ matrix_bot_buscarron_enabled: true # renovate: datasource=docker depName=registry.gitlab.com/etke.cc/buscarron -matrix_bot_buscarron_version: v1.4.0 +matrix_bot_buscarron_version: v1.4.1 # The hostname at which Buscarron is served. matrix_bot_buscarron_hostname: '' From 174dce2707598e5f56d96c83fc27837825fc231e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 17 Apr 2024 11:50:51 +0000 Subject: [PATCH 22/69] chore(deps): update halfshot/matrix-hookshot docker tag to v5.3.0 --- roles/custom/matrix-bridge-hookshot/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/custom/matrix-bridge-hookshot/defaults/main.yml b/roles/custom/matrix-bridge-hookshot/defaults/main.yml index 507b7692e..9f6738b3a 100644 --- a/roles/custom/matrix-bridge-hookshot/defaults/main.yml +++ b/roles/custom/matrix-bridge-hookshot/defaults/main.yml @@ -17,7 +17,7 @@ matrix_hookshot_container_additional_networks_auto: [] matrix_hookshot_container_additional_networks_custom: [] # renovate: datasource=docker depName=halfshot/matrix-hookshot -matrix_hookshot_version: 5.2.1 +matrix_hookshot_version: 5.3.0 matrix_hookshot_docker_image: "{{ matrix_hookshot_docker_image_name_prefix }}halfshot/matrix-hookshot:{{ matrix_hookshot_version }}" matrix_hookshot_docker_image_name_prefix: "{{ 'localhost/' if matrix_hookshot_container_image_self_build else matrix_container_global_registry_prefix }}" From 7d9eb0893ec9c0184f217ca1fb06f894ed5783a5 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Wed, 17 Apr 2024 15:34:56 +0300 Subject: [PATCH 23/69] Switch Hookshot from queue.xxx to cache.redisUri Related to: - https://github.com/matrix-org/matrix-hookshot/pull/902 - https://github.com/matrix-org/matrix-hookshot/releases/tag/5.3.0 - https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/3281 --- group_vars/matrix_servers | 10 +++++----- .../custom/matrix-bridge-hookshot/defaults/main.yml | 12 +++++++----- .../matrix-bridge-hookshot/tasks/validate_config.yml | 6 ++++-- .../matrix-bridge-hookshot/templates/config.yml.j2 | 8 +++----- 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers index d6afb580e..032669499 100755 --- a/group_vars/matrix_servers +++ b/group_vars/matrix_servers @@ -1863,15 +1863,15 @@ matrix_hookshot_systemd_wanted_services_list: | {{ matrix_addons_homeserver_systemd_services_list + - ([(redis_identifier + '.service')] if redis_enabled and matrix_hookshot_queue_host == redis_identifier else []) + ([(redis_identifier + '.service')] if redis_enabled and matrix_hookshot_cache_redis_host == redis_identifier else []) + - ([(keydb_identifier + '.service')] if keydb_enabled and matrix_hookshot_queue_host == keydb_identifier else []) + ([(keydb_identifier + '.service')] if keydb_enabled and matrix_hookshot_cache_redis_host == keydb_identifier else []) }} # Hookshot's experimental encryption feature (and possibly others) may benefit from Redis, if available. # We only connect to Redis if encryption is enabled (not for everyone who has Redis enabled), # because connectivity is still potentially troublesome and is to be investigated. -matrix_hookshot_queue_host: "{{ redis_identifier if redis_enabled and matrix_hookshot_experimental_encryption_enabled else (keydb_identifier if keydb_enabled and matrix_hookshot_experimental_encryption_enabled else '') }}" +matrix_hookshot_cache_redis_host: "{{ redis_identifier if redis_enabled and matrix_hookshot_experimental_encryption_enabled else (keydb_identifier if keydb_enabled and matrix_hookshot_experimental_encryption_enabled else '') }}" matrix_hookshot_container_network: "{{ matrix_addons_container_network }}" @@ -1880,9 +1880,9 @@ matrix_hookshot_container_additional_networks_auto: | ( ([] if matrix_addons_homeserver_container_network == '' else [matrix_addons_homeserver_container_network]) + - ([redis_container_network] if redis_enabled and matrix_hookshot_queue_host == redis_identifier else []) + ([redis_container_network] if redis_enabled and matrix_hookshot_cache_redis_host == redis_identifier else []) + - ([keydb_container_network] if keydb_enabled and matrix_hookshot_queue_host == keydb_identifier else []) + ([keydb_container_network] if keydb_enabled and matrix_hookshot_cache_redis_host == keydb_identifier else []) + ([matrix_playbook_reverse_proxyable_services_additional_network] if matrix_playbook_reverse_proxyable_services_additional_network and matrix_hookshot_container_labels_traefik_enabled else []) ) | unique diff --git a/roles/custom/matrix-bridge-hookshot/defaults/main.yml b/roles/custom/matrix-bridge-hookshot/defaults/main.yml index 9f6738b3a..cb34f033e 100644 --- a/roles/custom/matrix-bridge-hookshot/defaults/main.yml +++ b/roles/custom/matrix-bridge-hookshot/defaults/main.yml @@ -40,15 +40,17 @@ matrix_hookshot_appservice_port: 9993 matrix_hookshot_appservice_hostname: "{{ matrix_hookshot_public_hostname }}" matrix_hookshot_appservice_endpoint: "{{ matrix_hookshot_public_endpoint }}/_matrix/app" -# The variables below control the queue parameters and may optionally be pointed to a Redis instance. -# These are required when experimental encryption is enabled (`matrix_hookshot_experimental_encryption_enabled`). -matrix_hookshot_queue_host: '' -matrix_hookshot_queue_port: 6739 +# The variables below control the Redis cache parameters. +# Using caching is required when experimental encryption is enabled (`matrix_hookshot_experimental_encryption_enabled`) +# but may also speed up Hookshot startup, etc. +matrix_hookshot_cache_redis_host: '' +matrix_hookshot_cache_redis_port: 6739 +matrix_hookshot_cache_redisUri: "{{ ('redis://' + matrix_hookshot_cache_redis_host + ':' + matrix_hookshot_cache_redis_port) if matrix_hookshot_cache_redis_host else '' }}" # Controls whether the experimental end-to-bridge encryption support is enabled. # This requires that: # - support to also be enabled in the homeserver, see the documentation of Hookshot. -# - Hookshot to be pointed at a Redis instance via the `matrix_hookshot_queue_*` variables. +# - Hookshot to be pointed at a Redis instance via the `matrix_hookshot_cache_redis*` variables. matrix_hookshot_experimental_encryption_enabled: false # Controls whether metrics are enabled in the bridge configuration. diff --git a/roles/custom/matrix-bridge-hookshot/tasks/validate_config.yml b/roles/custom/matrix-bridge-hookshot/tasks/validate_config.yml index cb1fa3025..9a0f38353 100644 --- a/roles/custom/matrix-bridge-hookshot/tasks/validate_config.yml +++ b/roles/custom/matrix-bridge-hookshot/tasks/validate_config.yml @@ -29,6 +29,8 @@ - {'old': 'matrix_hookshot_jira_oauth_uri', 'new': 'matrix_hookshot_jira_oauth_client_secret'} - {'old': 'matrix_hookshot_gitlab_secret', 'new': 'matrix_hookshot_gitlab_webhook_secret'} - {'old': 'matrix_hookshot_ident', 'new': 'matrix_hookshot_identifier'} + - {'old': 'matrix_hookshot_queue_host', 'new': 'matrix_hookshot_cache_redis_host'} + - {'old': 'matrix_hookshot_queue_port', 'new': 'matrix_hookshot_cache_redis_port'} - name: Fail if required Hookshot settings not defined ansible.builtin.fail: @@ -93,8 +95,8 @@ - name: Fail if no Redis queue enabled when Hookshot encryption is enabled ansible.builtin.fail: msg: >- - You need to define a required configuration setting (`{{ item }}`) to enable Hookshot encryption. - when: "matrix_hookshot_experimental_encryption_enabled and matrix_hookshot_queue_host == ''" + You need to define a required configuration setting (`matrix_hookshot_cache_redis*`) to enable Hookshot encryption. + when: "matrix_hookshot_experimental_encryption_enabled and matrix_hookshot_cache_redisUri == ''" - name: (Deprecation) Catch and report old metrics usage ansible.builtin.fail: diff --git a/roles/custom/matrix-bridge-hookshot/templates/config.yml.j2 b/roles/custom/matrix-bridge-hookshot/templates/config.yml.j2 index 77036b52c..cf60803a8 100644 --- a/roles/custom/matrix-bridge-hookshot/templates/config.yml.j2 +++ b/roles/custom/matrix-bridge-hookshot/templates/config.yml.j2 @@ -107,11 +107,9 @@ metrics: # (Optional) Prometheus metrics support # enabled: {{ matrix_hookshot_metrics_enabled | to_json }} -{% if matrix_hookshot_queue_host != '' %} -queue: - monolithic: true - port: {{ matrix_hookshot_queue_port }} - host: {{ matrix_hookshot_queue_host | to_json }} +{% if matrix_hookshot_cache_redisUri %} +cache: + redisUri: {{ matrix_hookshot_cache_redisUri | to_json }} {% endif %} {% if matrix_hookshot_experimental_encryption_enabled %} experimentalEncryption: From 1774ed6e7dbb08b924c8f1d04c56537d4b32f141 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Wed, 17 Apr 2024 15:43:44 +0300 Subject: [PATCH 24/69] Make ansible-lint happy --- roles/custom/matrix-bridge-hookshot/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/custom/matrix-bridge-hookshot/defaults/main.yml b/roles/custom/matrix-bridge-hookshot/defaults/main.yml index cb34f033e..efcc6cc14 100644 --- a/roles/custom/matrix-bridge-hookshot/defaults/main.yml +++ b/roles/custom/matrix-bridge-hookshot/defaults/main.yml @@ -45,7 +45,7 @@ matrix_hookshot_appservice_endpoint: "{{ matrix_hookshot_public_endpoint }}/_mat # but may also speed up Hookshot startup, etc. matrix_hookshot_cache_redis_host: '' matrix_hookshot_cache_redis_port: 6739 -matrix_hookshot_cache_redisUri: "{{ ('redis://' + matrix_hookshot_cache_redis_host + ':' + matrix_hookshot_cache_redis_port) if matrix_hookshot_cache_redis_host else '' }}" +matrix_hookshot_cache_redisUri: "{{ ('redis://' + matrix_hookshot_cache_redis_host + ':' + matrix_hookshot_cache_redis_port) if matrix_hookshot_cache_redis_host else '' }}" # noqa var-naming # Controls whether the experimental end-to-bridge encryption support is enabled. # This requires that: From e12a8ef3f83e6791c8330787e4e56dbc0fc19a9d Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Wed, 17 Apr 2024 17:10:48 +0300 Subject: [PATCH 25/69] Upgrade synapse-admin (0.8.7 -> 0.9.2) Related to: - c203bef912682d737d3fab9a68115cfcd8a873fb - https://github.com/Awesome-Technologies/synapse-admin/issues/468 --- roles/custom/matrix-synapse-admin/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/custom/matrix-synapse-admin/defaults/main.yml b/roles/custom/matrix-synapse-admin/defaults/main.yml index 1dee1d756..bf32f0fc0 100644 --- a/roles/custom/matrix-synapse-admin/defaults/main.yml +++ b/roles/custom/matrix-synapse-admin/defaults/main.yml @@ -12,7 +12,7 @@ matrix_synapse_admin_container_image_self_build: false matrix_synapse_admin_container_image_self_build_repo: "https://github.com/Awesome-Technologies/synapse-admin.git" # renovate: datasource=docker depName=awesometechnologies/synapse-admin -matrix_synapse_admin_version: 0.8.7 +matrix_synapse_admin_version: 0.9.2 matrix_synapse_admin_docker_image: "{{ matrix_synapse_admin_docker_image_name_prefix }}awesometechnologies/synapse-admin:{{ matrix_synapse_admin_version }}" matrix_synapse_admin_docker_image_name_prefix: "{{ 'localhost/' if matrix_synapse_admin_container_image_self_build else matrix_container_global_registry_prefix }}" matrix_synapse_admin_docker_image_force_pull: "{{ matrix_synapse_admin_docker_image.endswith(':latest') }}" From 55a81ac368e48a85a44ec0267b247f6f325f9852 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 17 Apr 2024 20:08:40 +0000 Subject: [PATCH 26/69] chore(deps): update nginx docker tag to v1.25.5 --- .../matrix-synapse-reverse-proxy-companion/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/custom/matrix-synapse-reverse-proxy-companion/defaults/main.yml b/roles/custom/matrix-synapse-reverse-proxy-companion/defaults/main.yml index 08c425fa0..c4deb0872 100644 --- a/roles/custom/matrix-synapse-reverse-proxy-companion/defaults/main.yml +++ b/roles/custom/matrix-synapse-reverse-proxy-companion/defaults/main.yml @@ -11,7 +11,7 @@ matrix_synapse_reverse_proxy_companion_enabled: true # renovate: datasource=docker depName=nginx -matrix_synapse_reverse_proxy_companion_version: 1.25.4-alpine +matrix_synapse_reverse_proxy_companion_version: 1.25.5-alpine matrix_synapse_reverse_proxy_companion_base_path: "{{ matrix_synapse_base_path }}/reverse-proxy-companion" matrix_synapse_reverse_proxy_companion_confd_path: "{{ matrix_synapse_reverse_proxy_companion_base_path }}/conf.d" From 759d0fa7eda897ebf66e07107b9fefc3178c8a0c Mon Sep 17 00:00:00 2001 From: DevMiner Date: Fri, 19 Apr 2024 13:41:27 +0200 Subject: [PATCH 27/69] fix(hookshot): incorrect Redis port The default Redis port is 6379, not 6739. --- roles/custom/matrix-bridge-hookshot/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/custom/matrix-bridge-hookshot/defaults/main.yml b/roles/custom/matrix-bridge-hookshot/defaults/main.yml index efcc6cc14..dd8295a41 100644 --- a/roles/custom/matrix-bridge-hookshot/defaults/main.yml +++ b/roles/custom/matrix-bridge-hookshot/defaults/main.yml @@ -44,7 +44,7 @@ matrix_hookshot_appservice_endpoint: "{{ matrix_hookshot_public_endpoint }}/_mat # Using caching is required when experimental encryption is enabled (`matrix_hookshot_experimental_encryption_enabled`) # but may also speed up Hookshot startup, etc. matrix_hookshot_cache_redis_host: '' -matrix_hookshot_cache_redis_port: 6739 +matrix_hookshot_cache_redis_port: 6379 matrix_hookshot_cache_redisUri: "{{ ('redis://' + matrix_hookshot_cache_redis_host + ':' + matrix_hookshot_cache_redis_port) if matrix_hookshot_cache_redis_host else '' }}" # noqa var-naming # Controls whether the experimental end-to-bridge encryption support is enabled. From d9598f0bbd91744333dca82c7e5b3067b5bb1012 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Sat, 20 Apr 2024 08:14:17 +0300 Subject: [PATCH 28/69] Add support easily passing additional Docker daemon options Provoked by: https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/3247#issuecomment-2067207227 --- group_vars/matrix_servers | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers index 032669499..767be5e77 100755 --- a/group_vars/matrix_servers +++ b/group_vars/matrix_servers @@ -19,6 +19,14 @@ # Also see `devture_docker_sdk_for_python_installation_enabled`. matrix_playbook_docker_installation_enabled: true +matrix_playbook_docker_daemon_options: "{{ matrix_playbook_docker_daemon_options_auto | combine(matrix_playbook_docker_daemon_options_custom, recursive=True) }}" + +matrix_playbook_docker_daemon_options_auto: + experimental: "{{ devture_systemd_docker_base_ipv6_enabled }}" + ip6tables: "{{ devture_systemd_docker_base_ipv6_enabled }}" + +matrix_playbook_docker_daemon_options_custom: {} + # Controls whether to attach Traefik labels to services. # This is separate from `devture_traefik_enabled`, because you may wish to disable Traefik installation by the playbook, # yet still use Traefik installed in another way. @@ -483,13 +491,7 @@ devture_playbook_state_preserver_commit_hash_preservation_dst: "{{ matrix_base_d # # ######################################################################## -docker_daemon_options: | - {{ - { - 'experimental': devture_systemd_docker_base_ipv6_enabled, - 'ip6tables': devture_systemd_docker_base_ipv6_enabled, - } - }} +docker_daemon_options: "{{ matrix_playbook_docker_daemon_options }}" ######################################################################## # # From 4d91e8b57928ab49169678e6078727250f0b741f Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Sat, 20 Apr 2024 08:17:06 +0300 Subject: [PATCH 29/69] Rename some options Fixup for d9598f0bbd91744333dc Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/3247#issuecomment-2067207227 --- group_vars/matrix_servers | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers index 767be5e77..1ff4fb35a 100755 --- a/group_vars/matrix_servers +++ b/group_vars/matrix_servers @@ -19,13 +19,13 @@ # Also see `devture_docker_sdk_for_python_installation_enabled`. matrix_playbook_docker_installation_enabled: true -matrix_playbook_docker_daemon_options: "{{ matrix_playbook_docker_daemon_options_auto | combine(matrix_playbook_docker_daemon_options_custom, recursive=True) }}" +matrix_playbook_docker_installation_daemon_options: "{{ matrix_playbook_docker_installation_daemon_options_auto | combine(matrix_playbook_docker_installation_daemon_options_custom, recursive=True) }}" -matrix_playbook_docker_daemon_options_auto: +matrix_playbook_docker_installation_daemon_options_auto: experimental: "{{ devture_systemd_docker_base_ipv6_enabled }}" ip6tables: "{{ devture_systemd_docker_base_ipv6_enabled }}" -matrix_playbook_docker_daemon_options_custom: {} +matrix_playbook_docker_installation_daemon_options_custom: {} # Controls whether to attach Traefik labels to services. # This is separate from `devture_traefik_enabled`, because you may wish to disable Traefik installation by the playbook, @@ -491,7 +491,7 @@ devture_playbook_state_preserver_commit_hash_preservation_dst: "{{ matrix_base_d # # ######################################################################## -docker_daemon_options: "{{ matrix_playbook_docker_daemon_options }}" +docker_daemon_options: "{{ matrix_playbook_docker_installation_daemon_options }}" ######################################################################## # # From 6526a16e125202b0d1612196a789ef57dc555e9e Mon Sep 17 00:00:00 2001 From: Aine <97398200+etkecc@users.noreply.github.com> Date: Sun, 21 Apr 2024 00:07:28 +0300 Subject: [PATCH 30/69] Add project source url to synapse reverse proxy companion --- .../matrix-synapse-reverse-proxy-companion/defaults/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roles/custom/matrix-synapse-reverse-proxy-companion/defaults/main.yml b/roles/custom/matrix-synapse-reverse-proxy-companion/defaults/main.yml index c4deb0872..ac3dab8c1 100644 --- a/roles/custom/matrix-synapse-reverse-proxy-companion/defaults/main.yml +++ b/roles/custom/matrix-synapse-reverse-proxy-companion/defaults/main.yml @@ -7,6 +7,8 @@ # # When Synapse workers are enabled, however, the reverse-proxying configuration is much more complicated - certain requests need to go to certain workers, etc. # matrix-synapse-reverse-proxy-companion is the central place services that need to reach Synapse could be pointed to. +# +# Project source code URL: https://github.com/nginx/nginx matrix_synapse_reverse_proxy_companion_enabled: true From 303b081cc8fef111469dc121ae2aded130ff8116 Mon Sep 17 00:00:00 2001 From: Daniel Lo Nigro Date: Sat, 20 Apr 2024 18:47:00 -0700 Subject: [PATCH 31/69] [Conduit] Fix internal client API Traefik config --- roles/custom/matrix-conduit/templates/labels.j2 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/custom/matrix-conduit/templates/labels.j2 b/roles/custom/matrix-conduit/templates/labels.j2 index da6df1a77..33c2789a0 100644 --- a/roles/custom/matrix-conduit/templates/labels.j2 +++ b/roles/custom/matrix-conduit/templates/labels.j2 @@ -83,14 +83,14 @@ traefik.http.routers.matrix-conduit-public-client-api.tls.certResolver={{ matrix # # ############################################################ -traefik.http.routers.matrix-conduit-public-client-api.rule={{ matrix_conduit_container_labels_internal_client_api_traefik_rule }} +traefik.http.routers.matrix-conduit-internal-client-api.rule={{ matrix_conduit_container_labels_internal_client_api_traefik_rule }} {% if matrix_conduit_container_labels_internal_client_api_traefik_priority | int > 0 %} -traefik.http.routers.matrix-conduit-public-client-api.priority={{ matrix_conduit_container_labels_internal_client_api_traefik_priority }} +traefik.http.routers.matrix-conduit-internal-client-api.priority={{ matrix_conduit_container_labels_internal_client_api_traefik_priority }} {% endif %} -traefik.http.routers.matrix-conduit-public-client-api.service=matrix-conduit -traefik.http.routers.matrix-conduit-public-client-api.entrypoints={{ matrix_conduit_container_labels_internal_client_api_traefik_entrypoints }} +traefik.http.routers.matrix-conduit-internal-client-api.service=matrix-conduit +traefik.http.routers.matrix-conduit-internal-client-api.entrypoints={{ matrix_conduit_container_labels_internal_client_api_traefik_entrypoints }} ############################################################ # # From 9f160856cc2bb1c3b4038f0c46a1af6298058914 Mon Sep 17 00:00:00 2001 From: krassle <6473406+krassle@users.noreply.github.com> Date: Mon, 22 Apr 2024 01:59:15 +0200 Subject: [PATCH 32/69] Update main.yml --- roles/custom/matrix-client-element/defaults/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/custom/matrix-client-element/defaults/main.yml b/roles/custom/matrix-client-element/defaults/main.yml index 039bb73b3..dfd3bbeb1 100644 --- a/roles/custom/matrix-client-element/defaults/main.yml +++ b/roles/custom/matrix-client-element/defaults/main.yml @@ -160,8 +160,8 @@ matrix_client_element_welcome_logo: "themes/element/img/logos/element-logo.svg" # URL of link on welcome image matrix_client_element_welcome_logo_link: "https://element.io" -matrix_client_element_welcome_headline: "_t('Welcome to Element')" -matrix_client_element_welcome_text: "_t('Decentralised, encrypted chat & collaboration powered by [matrix]')" +matrix_client_element_welcome_headline: "_t(\"welcome_to_element\")" +matrix_client_element_welcome_text: "_t(\"powered_by_matrix_with_logo\")" # Links, shown in footer of welcome page: # [{"text": "Link text", "url": "https://link.target"}, {"text": "Other link"}] From 3d8fb3fc98b0db8b8e341a35ec86f1b4f5de7743 Mon Sep 17 00:00:00 2001 From: krassle <6473406+krassle@users.noreply.github.com> Date: Mon, 22 Apr 2024 02:01:14 +0200 Subject: [PATCH 33/69] Update welcome.html.j2 --- .../custom/matrix-client-element/templates/welcome.html.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/custom/matrix-client-element/templates/welcome.html.j2 b/roles/custom/matrix-client-element/templates/welcome.html.j2 index d1c604133..f25ac6812 100644 --- a/roles/custom/matrix-client-element/templates/welcome.html.j2 +++ b/roles/custom/matrix-client-element/templates/welcome.html.j2 @@ -178,11 +178,11 @@ we don't have an account and should hide them. No account == no guest account ei
-
_t("Sign In")
+
_t("action|sign_in")
 {% if matrix_client_element_registration_enabled %} -
_t("Create Account")
+
_t("action|create_account")
 {% endif %}
@@ -195,7 +195,7 @@ we don't have an account and should hide them. No account == no guest account ei
From 397940aeabfa0b21056efde0e5964c9cbe820542 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 22 Apr 2024 10:28:11 +0000 Subject: [PATCH 34/69] chore(deps): update awesometechnologies/synapse-admin docker tag to v0.9.4 --- roles/custom/matrix-synapse-admin/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/custom/matrix-synapse-admin/defaults/main.yml b/roles/custom/matrix-synapse-admin/defaults/main.yml index bf32f0fc0..ee149e684 100644 --- a/roles/custom/matrix-synapse-admin/defaults/main.yml +++ b/roles/custom/matrix-synapse-admin/defaults/main.yml @@ -12,7 +12,7 @@ matrix_synapse_admin_container_image_self_build: false matrix_synapse_admin_container_image_self_build_repo: "https://github.com/Awesome-Technologies/synapse-admin.git" # renovate: datasource=docker depName=awesometechnologies/synapse-admin -matrix_synapse_admin_version: 0.9.2 +matrix_synapse_admin_version: 0.9.4 matrix_synapse_admin_docker_image: "{{ matrix_synapse_admin_docker_image_name_prefix }}awesometechnologies/synapse-admin:{{ matrix_synapse_admin_version }}" matrix_synapse_admin_docker_image_name_prefix: "{{ 'localhost/' if matrix_synapse_admin_container_image_self_build else matrix_container_global_registry_prefix }}" matrix_synapse_admin_docker_image_force_pull: "{{ matrix_synapse_admin_docker_image.endswith(':latest') }}" From 7de63270cb3eba82130678e64adcb0c6de3d5f0a Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Tue, 23 Apr 2024 16:53:26 +0300 Subject: [PATCH 35/69] Upgrade Element (v1.11.64 -> v1.11.65) Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/3288 --- roles/custom/matrix-client-element/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/custom/matrix-client-element/defaults/main.yml b/roles/custom/matrix-client-element/defaults/main.yml index dfd3bbeb1..50b7c09b9 100644 --- a/roles/custom/matrix-client-element/defaults/main.yml +++ b/roles/custom/matrix-client-element/defaults/main.yml @@ -11,7 +11,7 @@ matrix_client_element_container_image_self_build_repo: "https://github.com/eleme matrix_client_element_container_image_self_build_low_memory_system_patch_enabled: "{{ ansible_memtotal_mb < 4096 }}" # renovate: datasource=docker depName=vectorim/element-web -matrix_client_element_version: v1.11.64 +matrix_client_element_version: v1.11.65 matrix_client_element_docker_image: "{{ matrix_client_element_docker_image_name_prefix }}vectorim/element-web:{{ matrix_client_element_version }}" matrix_client_element_docker_image_name_prefix: "{{ 'localhost/' if matrix_client_element_container_image_self_build else matrix_container_global_registry_prefix }}" From a293858e1c8d05b3e06086a59d586fea64979028 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Tue, 23 Apr 2024 16:54:10 +0300 Subject: [PATCH 36/69] Upgrade synapse-admin (0.9.4 -> 0.10.0) --- roles/custom/matrix-synapse-admin/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/custom/matrix-synapse-admin/defaults/main.yml b/roles/custom/matrix-synapse-admin/defaults/main.yml index ee149e684..2a65507ca 100644 --- a/roles/custom/matrix-synapse-admin/defaults/main.yml +++ b/roles/custom/matrix-synapse-admin/defaults/main.yml @@ -12,7 +12,7 @@ matrix_synapse_admin_container_image_self_build: false matrix_synapse_admin_container_image_self_build_repo: "https://github.com/Awesome-Technologies/synapse-admin.git" # renovate: datasource=docker depName=awesometechnologies/synapse-admin -matrix_synapse_admin_version: 0.9.4 +matrix_synapse_admin_version: 0.10.0 matrix_synapse_admin_docker_image: "{{ matrix_synapse_admin_docker_image_name_prefix }}awesometechnologies/synapse-admin:{{ matrix_synapse_admin_version }}" matrix_synapse_admin_docker_image_name_prefix: "{{ 'localhost/' if matrix_synapse_admin_container_image_self_build else matrix_container_global_registry_prefix }}" matrix_synapse_admin_docker_image_force_pull: "{{ matrix_synapse_admin_docker_image.endswith(':latest') }}" From e5296c602391f79509440ba32409cb7c9b678b27 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 23 Apr 2024 15:39:08 +0000 Subject: [PATCH 37/69] chore(deps): update ghcr.io/element-hq/synapse docker tag to v1.105.1 --- roles/custom/matrix-synapse/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/custom/matrix-synapse/defaults/main.yml b/roles/custom/matrix-synapse/defaults/main.yml index 3339f55df..26b4afe8c 100644 --- a/roles/custom/matrix-synapse/defaults/main.yml +++ b/roles/custom/matrix-synapse/defaults/main.yml @@ -16,7 +16,7 @@ matrix_synapse_enabled: true matrix_synapse_github_org_and_repo: element-hq/synapse # renovate: datasource=docker depName=ghcr.io/element-hq/synapse -matrix_synapse_version: v1.105.0 +matrix_synapse_version: v1.105.1 matrix_synapse_username: '' matrix_synapse_uid: '' From 44355ebbb493487ac7dafd547eace82cb24c06f3 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Wed, 24 Apr 2024 14:41:16 +0300 Subject: [PATCH 38/69] Make AUX role run last (before service manager role) Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/3292 --- setup.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.yml b/setup.yml index 9d5db5bc0..d93a71a2e 100644 --- a/setup.yml +++ b/setup.yml @@ -126,8 +126,6 @@ - custom/matrix-media-repo - custom/matrix-pantalaimon - - role: galaxy/auxiliary - - role: galaxy/postgres_backup - role: galaxy/backup_borg @@ -141,6 +139,8 @@ - role: galaxy/traefik_certs_dumper + - role: galaxy/auxiliary + - when: devture_systemd_service_manager_enabled | bool role: galaxy/systemd_service_manager From 9b18d75e1f634fd5f4e69975c3cd39062128dbeb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 24 Apr 2024 15:50:06 +0000 Subject: [PATCH 39/69] chore(deps): update awesometechnologies/synapse-admin docker tag to v0.10.1 --- roles/custom/matrix-synapse-admin/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/custom/matrix-synapse-admin/defaults/main.yml b/roles/custom/matrix-synapse-admin/defaults/main.yml index 2a65507ca..cb20be673 100644 --- a/roles/custom/matrix-synapse-admin/defaults/main.yml +++ b/roles/custom/matrix-synapse-admin/defaults/main.yml @@ -12,7 +12,7 @@ matrix_synapse_admin_container_image_self_build: false matrix_synapse_admin_container_image_self_build_repo: "https://github.com/Awesome-Technologies/synapse-admin.git" # renovate: datasource=docker depName=awesometechnologies/synapse-admin -matrix_synapse_admin_version: 0.10.0 +matrix_synapse_admin_version: 0.10.1 matrix_synapse_admin_docker_image: "{{ matrix_synapse_admin_docker_image_name_prefix }}awesometechnologies/synapse-admin:{{ matrix_synapse_admin_version }}" matrix_synapse_admin_docker_image_name_prefix: "{{ 'localhost/' if matrix_synapse_admin_container_image_self_build else matrix_container_global_registry_prefix }}" matrix_synapse_admin_docker_image_force_pull: "{{ matrix_synapse_admin_docker_image.endswith(':latest') }}" From ff251bf0fecb9c78c6305f20c547eaa80671bf73 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 24 Apr 2024 15:50:11 +0000 Subject: [PATCH 40/69] chore(deps): update dependency prometheus_node_exporter to v1.8.0-0 --- requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.yml b/requirements.yml index ca6b150f3..9521fa318 100644 --- a/requirements.yml +++ b/requirements.yml @@ -52,7 +52,7 @@ version: v2.51.2-0 name: prometheus - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-prometheus-node-exporter.git - version: v1.7.0-3 + version: v1.8.0-0 name: prometheus_node_exporter - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-prometheus-postgres-exporter.git version: v0.14.0-4 From b0014f05e7ae9322c182cf0b6efec9df7ba48ea5 Mon Sep 17 00:00:00 2001 From: adam-kress Date: Wed, 24 Apr 2024 17:18:24 -0400 Subject: [PATCH 41/69] Upgrade Jitsi (v9364-1 -> v9457-0) --- requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.yml b/requirements.yml index 9521fa318..a996739e8 100644 --- a/requirements.yml +++ b/requirements.yml @@ -25,7 +25,7 @@ version: v10.4.2-0 name: grafana - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-jitsi.git - version: v9364-1 + version: v9457-0 name: jitsi - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-keydb.git version: v6.3.4-1 From c1241761fd187d2ba9db331e6b9c0878809ff47b Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Thu, 25 Apr 2024 06:53:10 +0300 Subject: [PATCH 42/69] Upgrade Jitsi (v9457-0 -> v9457-1) --- requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.yml b/requirements.yml index a996739e8..8ce474816 100644 --- a/requirements.yml +++ b/requirements.yml @@ -25,7 +25,7 @@ version: v10.4.2-0 name: grafana - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-jitsi.git - version: v9457-0 + version: v9457-1 name: jitsi - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-keydb.git version: v6.3.4-1 From a10b68d2d551f5e8af2636aeff0bd00230ad7beb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 25 Apr 2024 07:06:36 +0000 Subject: [PATCH 43/69] chore(deps): update matrixconduit/matrix-conduit docker tag to v0.7.0 --- roles/custom/matrix-conduit/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/custom/matrix-conduit/defaults/main.yml b/roles/custom/matrix-conduit/defaults/main.yml index 3957c5c43..215ee4a2a 100644 --- a/roles/custom/matrix-conduit/defaults/main.yml +++ b/roles/custom/matrix-conduit/defaults/main.yml @@ -10,7 +10,7 @@ matrix_conduit_hostname: '' matrix_conduit_docker_image: "{{ matrix_conduit_docker_image_name_prefix }}matrixconduit/matrix-conduit:{{ matrix_conduit_docker_image_tag }}" matrix_conduit_docker_image_name_prefix: "docker.io/" # renovate: datasource=docker depName=matrixconduit/matrix-conduit -matrix_conduit_docker_image_tag: "v0.6.0" +matrix_conduit_docker_image_tag: "v0.7.0" matrix_conduit_docker_image_force_pull: "{{ matrix_conduit_docker_image.endswith(':latest') }}" matrix_conduit_base_path: "{{ matrix_base_data_path }}/conduit" From 54358cdfdef8d01c7bbe6e8da6a8c6f519bf9b60 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Thu, 25 Apr 2024 13:30:52 +0300 Subject: [PATCH 44/69] Upgrade Jitsi (v9457-1 -> v9457-2) Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/commit/c1241761fd187d2ba9db331e6b9c0878809ff47b#commitcomment-141351388 --- requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.yml b/requirements.yml index 8ce474816..33a291c15 100644 --- a/requirements.yml +++ b/requirements.yml @@ -25,7 +25,7 @@ version: v10.4.2-0 name: grafana - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-jitsi.git - version: v9457-1 + version: v9457-2 name: jitsi - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-keydb.git version: v6.3.4-1 From 11b76bd0c2398e093617e01e14a1028b95002805 Mon Sep 17 00:00:00 2001 From: Aine <97398200+etkecc@users.noreply.github.com> Date: Thu, 25 Apr 2024 22:49:01 +0300 Subject: [PATCH 45/69] fix redis port type The conditional check 'matrix_hookshot_experimental_encryption_enabled and matrix_hookshot_cache_redisUri == ''' failed. The error was: An unhandled exception occurred while templating '{{ ('redis://' + matrix_hookshot_cache_redis_host + ':' + matrix_hookshot_cache_redis_port) if matrix_hookshot_cache_redis_host else '' }}'. Error was a , original message: Unexpected templating type error occurred on ({{ ('redis://' + matrix_hookshot_cache_redis_host + ':' + matrix_hookshot_cache_redis_port) if matrix_hookshot_cache_redis_host else '' }}): can only concatenate str (not \"int\") to str. can only concatenate str (not \"int\") to str --- roles/custom/matrix-bridge-hookshot/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/custom/matrix-bridge-hookshot/defaults/main.yml b/roles/custom/matrix-bridge-hookshot/defaults/main.yml index dd8295a41..d350e0081 100644 --- a/roles/custom/matrix-bridge-hookshot/defaults/main.yml +++ b/roles/custom/matrix-bridge-hookshot/defaults/main.yml @@ -44,7 +44,7 @@ matrix_hookshot_appservice_endpoint: "{{ matrix_hookshot_public_endpoint }}/_mat # Using caching is required when experimental encryption is enabled (`matrix_hookshot_experimental_encryption_enabled`) # but may also speed up Hookshot startup, etc. matrix_hookshot_cache_redis_host: '' -matrix_hookshot_cache_redis_port: 6379 +matrix_hookshot_cache_redis_port: "6379" matrix_hookshot_cache_redisUri: "{{ ('redis://' + matrix_hookshot_cache_redis_host + ':' + matrix_hookshot_cache_redis_port) if matrix_hookshot_cache_redis_host else '' }}" # noqa var-naming # Controls whether the experimental end-to-bridge encryption support is enabled. From 664de248c054175a5926e09ae8205b5d5ef8c686 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 26 Apr 2024 14:38:20 +0000 Subject: [PATCH 46/69] chore(deps): update ghcr.io/matrix-org/sliding-sync docker tag to v0.99.16 --- roles/custom/matrix-sliding-sync/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/custom/matrix-sliding-sync/defaults/main.yml b/roles/custom/matrix-sliding-sync/defaults/main.yml index f7028f120..a8a31683c 100644 --- a/roles/custom/matrix-sliding-sync/defaults/main.yml +++ b/roles/custom/matrix-sliding-sync/defaults/main.yml @@ -6,7 +6,7 @@ matrix_sliding_sync_enabled: true # renovate: datasource=docker depName=ghcr.io/matrix-org/sliding-sync -matrix_sliding_sync_version: v0.99.15 +matrix_sliding_sync_version: v0.99.16 matrix_sliding_sync_scheme: https From 5ad20d5c925182322be689682ecb0a275a190468 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 29 Apr 2024 04:08:26 +0000 Subject: [PATCH 47/69] chore(deps): update joseluisq/static-web-server docker tag to v2.30.0 --- roles/custom/matrix-cactus-comments-client/defaults/main.yml | 2 +- roles/custom/matrix-static-files/defaults/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/custom/matrix-cactus-comments-client/defaults/main.yml b/roles/custom/matrix-cactus-comments-client/defaults/main.yml index be967e686..882e6dc16 100644 --- a/roles/custom/matrix-cactus-comments-client/defaults/main.yml +++ b/roles/custom/matrix-cactus-comments-client/defaults/main.yml @@ -13,7 +13,7 @@ matrix_cactus_comments_client_public_path: "{{ matrix_cactus_comments_client_bas matrix_cactus_comments_client_public_path_file_permissions: "0644" # renovate: datasource=docker depName=joseluisq/static-web-server -matrix_cactus_comments_client_version: 2.28.0 +matrix_cactus_comments_client_version: 2.30.0 matrix_cactus_comments_client_container_image: "{{ matrix_container_global_registry_prefix }}joseluisq/static-web-server:{{ matrix_cactus_comments_client_container_image_tag }}" matrix_cactus_comments_client_container_image_tag: "{{ 'latest' if matrix_cactus_comments_client_version == 'latest' else (matrix_cactus_comments_client_version + '-alpine') }}" diff --git a/roles/custom/matrix-static-files/defaults/main.yml b/roles/custom/matrix-static-files/defaults/main.yml index fc83e7100..1027e7d57 100644 --- a/roles/custom/matrix-static-files/defaults/main.yml +++ b/roles/custom/matrix-static-files/defaults/main.yml @@ -8,7 +8,7 @@ matrix_static_files_enabled: true matrix_static_files_identifier: matrix-static-files # renovate: datasource=docker depName=joseluisq/static-web-server -matrix_static_files_version: 2.28.0 +matrix_static_files_version: 2.30.0 matrix_static_files_base_path: "{{ matrix_base_data_path }}/{{ 'static-files' if matrix_static_files_identifier == 'matrix-static-files' else matrix_static_files_identifier }}" matrix_static_files_config_path: "{{ matrix_static_files_base_path }}/config" From 0e6ca85a631157411563e8425c19fe81e7ec0ba8 Mon Sep 17 00:00:00 2001 From: adam-kress Date: Mon, 29 Apr 2024 13:01:48 -0400 Subject: [PATCH 48/69] Upgrade Jitsi (v9457-2 -> v9457-3) --- requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.yml b/requirements.yml index 33a291c15..69bfcd9b6 100644 --- a/requirements.yml +++ b/requirements.yml @@ -25,7 +25,7 @@ version: v10.4.2-0 name: grafana - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-jitsi.git - version: v9457-2 + version: v9457-3 name: jitsi - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-keydb.git version: v6.3.4-1 From 1f97602525b04bf23c7cd3b869b46545c9f2632c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 30 Apr 2024 09:38:13 +0000 Subject: [PATCH 49/69] chore(deps): update registry.gitlab.com/etke.cc/honoroit docker tag to v0.9.21 --- roles/custom/matrix-bot-honoroit/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/custom/matrix-bot-honoroit/defaults/main.yml b/roles/custom/matrix-bot-honoroit/defaults/main.yml index 76ab590f6..d11f2a769 100644 --- a/roles/custom/matrix-bot-honoroit/defaults/main.yml +++ b/roles/custom/matrix-bot-honoroit/defaults/main.yml @@ -21,7 +21,7 @@ matrix_bot_honoroit_docker_repo_version: "{{ matrix_bot_honoroit_version }}" matrix_bot_honoroit_docker_src_files_path: "{{ matrix_base_data_path }}/honoroit/docker-src" # renovate: datasource=docker depName=registry.gitlab.com/etke.cc/honoroit -matrix_bot_honoroit_version: v0.9.20 +matrix_bot_honoroit_version: v0.9.21 matrix_bot_honoroit_docker_image: "{{ matrix_bot_honoroit_docker_image_name_prefix }}etke.cc/honoroit:{{ matrix_bot_honoroit_version }}" matrix_bot_honoroit_docker_image_name_prefix: "{{ 'localhost/' if matrix_bot_honoroit_container_image_self_build else 'registry.gitlab.com/' }}" matrix_bot_honoroit_docker_image_force_pull: "{{ matrix_bot_honoroit_docker_image.endswith(':latest') }}" From bf002f6af8536c7faca5b1bbabf94aaea028ddb8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 30 Apr 2024 09:38:17 +0000 Subject: [PATCH 50/69] chore(deps): update registry.gitlab.com/etke.cc/postmoogle docker tag to v0.9.18 --- roles/custom/matrix-bot-postmoogle/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/custom/matrix-bot-postmoogle/defaults/main.yml b/roles/custom/matrix-bot-postmoogle/defaults/main.yml index 9d3556a0c..08799a7e8 100644 --- a/roles/custom/matrix-bot-postmoogle/defaults/main.yml +++ b/roles/custom/matrix-bot-postmoogle/defaults/main.yml @@ -10,7 +10,7 @@ matrix_bot_postmoogle_docker_repo_version: "{{ 'main' if matrix_bot_postmoogle_v matrix_bot_postmoogle_docker_src_files_path: "{{ matrix_base_data_path }}/postmoogle/docker-src" # renovate: datasource=docker depName=registry.gitlab.com/etke.cc/postmoogle -matrix_bot_postmoogle_version: v0.9.17 +matrix_bot_postmoogle_version: v0.9.18 matrix_bot_postmoogle_docker_image: "{{ matrix_bot_postmoogle_docker_image_name_prefix }}etke.cc/postmoogle:{{ matrix_bot_postmoogle_version }}" matrix_bot_postmoogle_docker_image_name_prefix: "{{ 'localhost/' if matrix_bot_postmoogle_container_image_self_build else 'registry.gitlab.com/' }}" matrix_bot_postmoogle_docker_image_force_pull: "{{ matrix_bot_postmoogle_docker_image.endswith(':latest') }}" From 6f4e207823c6def9e3643e7d254f93015ed51256 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 30 Apr 2024 14:01:31 +0000 Subject: [PATCH 51/69] chore(deps): update ghcr.io/element-hq/synapse docker tag to v1.106.0 --- roles/custom/matrix-synapse/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/custom/matrix-synapse/defaults/main.yml b/roles/custom/matrix-synapse/defaults/main.yml index 26b4afe8c..0f10ed24b 100644 --- a/roles/custom/matrix-synapse/defaults/main.yml +++ b/roles/custom/matrix-synapse/defaults/main.yml @@ -16,7 +16,7 @@ matrix_synapse_enabled: true matrix_synapse_github_org_and_repo: element-hq/synapse # renovate: datasource=docker depName=ghcr.io/element-hq/synapse -matrix_synapse_version: v1.105.1 +matrix_synapse_version: v1.106.0 matrix_synapse_username: '' matrix_synapse_uid: '' From 9e6676d089a9b389ebbe1bda98f06bf8cd44a058 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 2 May 2024 22:32:51 +0000 Subject: [PATCH 52/69] chore(deps): update dependency etherpad to v2.0.3-0 --- requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.yml b/requirements.yml index 69bfcd9b6..4b3f044e1 100644 --- a/requirements.yml +++ b/requirements.yml @@ -16,7 +16,7 @@ version: 129c8590e106b83e6f4c259649a613c6279e937a name: docker_sdk_for_python - src: git+https://gitlab.com/etke.cc/roles/etherpad.git - version: v2.0.1-2 + version: v2.0.3-0 name: etherpad - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-exim-relay.git version: v4.97.1-r0-0-2 From a6f0d643ed9c7a259aa57f89ce15b0fb80d962de Mon Sep 17 00:00:00 2001 From: Marty Date: Sun, 5 May 2024 08:53:18 +0200 Subject: [PATCH 53/69] Update maintenance-postgres.md Seems that borg backup support was added by the commit b61b908c2ed3515aab78f6121640de845c630af7 --- docs/maintenance-postgres.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/docs/maintenance-postgres.md b/docs/maintenance-postgres.md index 74eed348c..1c162cb0e 100644 --- a/docs/maintenance-postgres.md +++ b/docs/maintenance-postgres.md @@ -87,8 +87,6 @@ This playbook can upgrade your existing Postgres setup with the following comman just run-tags upgrade-postgres ``` -**Warning: If you're using Borg Backup keep in mind that there is no official Postgres 16 support yet.** - **The old Postgres data directory is backed up** automatically, by renaming it to `/matrix/postgres/data-auto-upgrade-backup`. To rename to a different path, pass some extra flags to the command above, like this: `--extra-vars="postgres_auto_upgrade_backup_data_path=/another/disk/matrix-postgres-before-upgrade"` From a967f44c10ca2d9ce4ad902d89f4ca10c597da6c Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Tue, 7 May 2024 09:31:44 +0300 Subject: [PATCH 54/69] Ensure matrix-ssl-nginx-proxy-reload.{timer,service} are removed Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/3307 --- .../matrix_playbook_migration/tasks/uninstall_matrix_ssl.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/roles/custom/matrix_playbook_migration/tasks/uninstall_matrix_ssl.yml b/roles/custom/matrix_playbook_migration/tasks/uninstall_matrix_ssl.yml index c1c66409b..20e600e1f 100644 --- a/roles/custom/matrix_playbook_migration/tasks/uninstall_matrix_ssl.yml +++ b/roles/custom/matrix_playbook_migration/tasks/uninstall_matrix_ssl.yml @@ -5,10 +5,12 @@ path: "{{ matrix_base_data_path }}/ssl" state: absent -- name: Ensure matrix-ssl-lets-encrypt-certificates-renew systemd timer and service are gone +- name: Ensure matrix SSL-related systemd timers and services are gone ansible.builtin.file: path: "{{ devture_systemd_docker_base_systemd_path }}/{{ item }}" state: absent with_items: - matrix-ssl-lets-encrypt-certificates-renew.timer - matrix-ssl-lets-encrypt-certificates-renew.service + - matrix-ssl-nginx-proxy-reload.timer + - matrix-ssl-nginx-proxy-reload.service From 4d22f8483019a98b44a894b5ca45dd54e9fc268a Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Tue, 7 May 2024 16:01:48 +0300 Subject: [PATCH 55/69] Upgrade Element (v1.11.65 -> v1.11.66) --- roles/custom/matrix-client-element/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/custom/matrix-client-element/defaults/main.yml b/roles/custom/matrix-client-element/defaults/main.yml index 50b7c09b9..fa15efeb0 100644 --- a/roles/custom/matrix-client-element/defaults/main.yml +++ b/roles/custom/matrix-client-element/defaults/main.yml @@ -11,7 +11,7 @@ matrix_client_element_container_image_self_build_repo: "https://github.com/eleme matrix_client_element_container_image_self_build_low_memory_system_patch_enabled: "{{ ansible_memtotal_mb < 4096 }}" # renovate: datasource=docker depName=vectorim/element-web -matrix_client_element_version: v1.11.65 +matrix_client_element_version: v1.11.66 matrix_client_element_docker_image: "{{ matrix_client_element_docker_image_name_prefix }}vectorim/element-web:{{ matrix_client_element_version }}" matrix_client_element_docker_image_name_prefix: "{{ 'localhost/' if matrix_client_element_container_image_self_build else matrix_container_global_registry_prefix }}" From b46085286ed3e68ce4bdedb39f9b04a4875c6242 Mon Sep 17 00:00:00 2001 From: Kris Watson Date: Wed, 8 May 2024 10:33:30 -0700 Subject: [PATCH 56/69] Remove duplicate https from hookshot redirect_uri matrix_hookshot_github_oauth_redirect_uri was adding an extra https in front of matrix_hookshot_urlprefix, which already included that. --- roles/custom/matrix-bridge-hookshot/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/custom/matrix-bridge-hookshot/defaults/main.yml b/roles/custom/matrix-bridge-hookshot/defaults/main.yml index d350e0081..e5f2af0bf 100644 --- a/roles/custom/matrix-bridge-hookshot/defaults/main.yml +++ b/roles/custom/matrix-bridge-hookshot/defaults/main.yml @@ -93,7 +93,7 @@ matrix_hookshot_github_oauth_client_id: '' # "Client ID" on the GitHub App page matrix_hookshot_github_oauth_client_secret: '' # "Client Secret" on the GitHub App page # Default value of matrix_hookshot_github_oauth_endpoint: "/hookshot/webhooks/oauth" matrix_hookshot_github_oauth_endpoint: "{{ matrix_hookshot_webhook_endpoint }}/oauth" -matrix_hookshot_github_oauth_redirect_uri: "https://{{ matrix_hookshot_urlprefix }}{{ matrix_hookshot_github_oauth_endpoint }}" +matrix_hookshot_github_oauth_redirect_uri: "{{ matrix_hookshot_urlprefix }}{{ matrix_hookshot_github_oauth_endpoint }}" # These are the default settings mentioned here and don't need to be modified: https://matrix-org.github.io/matrix-hookshot/usage/room_configuration/github_repo.html#configuration matrix_hookshot_github_defaultOptions_ignoreHooks: {} # noqa var-naming From 285decd7f2137198c43446c4a13d70fb555a33dc Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 10 May 2024 10:24:32 +0000 Subject: [PATCH 57/69] chore(deps): update ghcr.io/matrix-org/rageshake docker tag to v1.13.0 --- roles/custom/matrix-rageshake/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/custom/matrix-rageshake/defaults/main.yml b/roles/custom/matrix-rageshake/defaults/main.yml index 0598a0b7b..9289f0dd9 100644 --- a/roles/custom/matrix-rageshake/defaults/main.yml +++ b/roles/custom/matrix-rageshake/defaults/main.yml @@ -17,7 +17,7 @@ matrix_rageshake_path_prefix: / # There are no stable container image tags yet. # See: https://github.com/matrix-org/rageshake/issues/69 # renovate: datasource=docker depName=ghcr.io/matrix-org/rageshake -matrix_rageshake_version: 1.12.0 +matrix_rageshake_version: 1.13.0 matrix_rageshake_base_path: "{{ matrix_base_data_path }}/rageshake" matrix_rageshake_config_path: "{{ matrix_rageshake_base_path }}/config" From 16ef282f84ad204e96fb81f21c57ded078a904cf Mon Sep 17 00:00:00 2001 From: ash Date: Fri, 10 May 2024 15:11:13 +0200 Subject: [PATCH 58/69] fix(docs): minor typo --- docs/maintenance-synapse.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/maintenance-synapse.md b/docs/maintenance-synapse.md index 93c150022..f89594a45 100644 --- a/docs/maintenance-synapse.md +++ b/docs/maintenance-synapse.md @@ -74,7 +74,7 @@ Synapse's presence feature which tracks which users are online and which are off If you have enough compute resources (CPU & RAM), you can make Synapse better use of them by [enabling load-balancing with workers](configuring-playbook-synapse.md#load-balancing-with-workers). -[Tuning your PostgreSQL database](maintenance-postgres.md#tuning-postgresql) could also improve Synapse performance. The playbook tunes the integrated Postgres database automatically, but based on your needs you may wish to adjust tuning variables manually. If you're using an [external Postgres database](configuring-playbook-external-postgres.md), you will aslo need to tune Postgres manually. +[Tuning your PostgreSQL database](maintenance-postgres.md#tuning-postgresql) could also improve Synapse performance. The playbook tunes the integrated Postgres database automatically, but based on your needs you may wish to adjust tuning variables manually. If you're using an [external Postgres database](configuring-playbook-external-postgres.md), you will also need to tune Postgres manually. ### Tuning caches and cache autotuning From 047bc04f64571045c20776b8466fac5a55fa69ac Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Fri, 10 May 2024 17:36:27 +0300 Subject: [PATCH 59/69] Upgrade sliding-sync (v0.99.16 -> v0.99.17) --- roles/custom/matrix-sliding-sync/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/custom/matrix-sliding-sync/defaults/main.yml b/roles/custom/matrix-sliding-sync/defaults/main.yml index a8a31683c..522dd2a9b 100644 --- a/roles/custom/matrix-sliding-sync/defaults/main.yml +++ b/roles/custom/matrix-sliding-sync/defaults/main.yml @@ -6,7 +6,7 @@ matrix_sliding_sync_enabled: true # renovate: datasource=docker depName=ghcr.io/matrix-org/sliding-sync -matrix_sliding_sync_version: v0.99.16 +matrix_sliding_sync_version: v0.99.17 matrix_sliding_sync_scheme: https From de371f675b1b3a4585c0381ec671e7ee9081a3d0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 10 May 2024 22:46:57 +0000 Subject: [PATCH 60/69] chore(deps): update dependency prometheus to v2.52.0-0 --- requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.yml b/requirements.yml index 4b3f044e1..cb5824f20 100644 --- a/requirements.yml +++ b/requirements.yml @@ -49,7 +49,7 @@ version: 046004a8cb9946979b72ce81c2526c8033ea8067 name: postgres_backup - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-prometheus.git - version: v2.51.2-0 + version: v2.52.0-0 name: prometheus - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-prometheus-node-exporter.git version: v1.8.0-0 From 9fcf2b84867ea6a770defd729f443f8d0ee016bb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 14 May 2024 14:03:49 +0000 Subject: [PATCH 61/69] chore(deps): update dependency grafana to v11 --- requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.yml b/requirements.yml index cb5824f20..978af31f6 100644 --- a/requirements.yml +++ b/requirements.yml @@ -22,7 +22,7 @@ version: v4.97.1-r0-0-2 name: exim_relay - src: git+https://gitlab.com/etke.cc/roles/grafana.git - version: v10.4.2-0 + version: v11.0.0-0 name: grafana - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-jitsi.git version: v9457-3 From 2bdc6db2eb1e097c0698c3a58fee09d4e6d361e2 Mon Sep 17 00:00:00 2001 From: Fabio Bonelli Date: Tue, 14 May 2024 16:12:11 +0200 Subject: [PATCH 62/69] Add puppeting option to matrix-bridge-appservice-slack Fix #2720. --- ...guring-playbook-bridge-appservice-slack.md | 32 ++++++++++++++----- .../defaults/main.yml | 8 +++++ .../templates/config.yaml.j2 | 20 ++++++++++++ 3 files changed, 52 insertions(+), 8 deletions(-) diff --git a/docs/configuring-playbook-bridge-appservice-slack.md b/docs/configuring-playbook-bridge-appservice-slack.md index 3e6f798e4..5bf988268 100644 --- a/docs/configuring-playbook-bridge-appservice-slack.md +++ b/docs/configuring-playbook-bridge-appservice-slack.md @@ -20,8 +20,24 @@ matrix_appservice_slack_enabled: true matrix_appservice_slack_control_room_id: "Your matrix admin room id" ``` -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. Invite the bridge bot user into the admin room: +3. Enable puppeting (optional, but recommended) + +```yaml +matrix_appservice_slack_puppeting_enabled: true +matrix_appservice_slack_puppeting_slackapp_client_id: "Your Classic Slack App Client ID" +matrix_appservice_slack_puppeting_slackapp_client_secret: "Your Classic Slack App Client Secret" +``` + +4. Enable Team Sync (optional) + +```yaml +matrix_appservice_slack_team_sync_enabled: true +``` + + See https://matrix-appservice-slack.readthedocs.io/en/latest/team_sync/ + +4. 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. +5. Invite the bridge bot user into the admin room: ``` /invite @slackbot:MY.DOMAIN @@ -29,7 +45,7 @@ matrix_appservice_slack_control_room_id: "Your matrix admin room id" Note that the bot's domain is your server's domain **without the `matrix.` prefix.** -5. Create a Classic Slack App [here](https://api.slack.com/apps?new_classic_app=1). +6. Create a Classic Slack App [here](https://api.slack.com/apps?new_classic_app=1). Name the app "matrixbot" (or anything else you'll remember). @@ -37,7 +53,7 @@ Note that the bot's domain is your server's domain **without the `matrix.` prefi Click on bot users and add a new bot user. We will use this account to bridge the the rooms. -6. Click on Event Subscriptions and enable them and use the request url `https://matrix.DOMAIN/appservice-slack`. Then add the following events and save: +7. Click on Event Subscriptions and enable them and use the request url `https://matrix.DOMAIN/appservice-slack`. Then add the following events and save: Bot User Events: @@ -47,7 +63,7 @@ Note that the bot's domain is your server's domain **without the `matrix.` prefi - reaction_added - reaction_removed -7. Click on OAuth & Permissions and add the following scopes: +8. Click on OAuth & Permissions and add the following scopes: - chat:write:bot - users:read @@ -59,9 +75,9 @@ Note that the bot's domain is your server's domain **without the `matrix.` prefi Note: In order to make Slack files visible to matrix users, this bridge will make Slack files visible to anyone with the url (including files in private channels). This is different than the current behavior in Slack, which only allows authenticated access to media posted in private channels. See MSC701 for details. -8. Click on Install App and Install App to Workspace. Note the access tokens shown. You will need the Bot User OAuth Access Token and if you want to bridge files, the OAuth Access Token whenever you link a room. +9. Click on Install App and Install App to Workspace. Note the access tokens shown. You will need the Bot User OAuth Access Token and if you want to bridge files, the OAuth Access Token whenever you link a room. -9. For each channel you would like to bridge, perform the following steps: +10. If Team Sync is not enabled, for each channel you would like to bridge, perform the following steps: * Create a Matrix room in the usual manner for your client. Take a note of its Matrix room ID - it will look something like !aBcDeF:example.com. @@ -86,7 +102,7 @@ Note that the bot's domain is your server's domain **without the `matrix.` prefi Other configuration options are available via the `matrix_appservice_slack_configuration_extension_yaml` variable. -10. Unlinking +11. Unlinking Channels can be unlinked again like this: ``` diff --git a/roles/custom/matrix-bridge-appservice-slack/defaults/main.yml b/roles/custom/matrix-bridge-appservice-slack/defaults/main.yml index eb4863530..73449d729 100644 --- a/roles/custom/matrix-bridge-appservice-slack/defaults/main.yml +++ b/roles/custom/matrix-bridge-appservice-slack/defaults/main.yml @@ -105,6 +105,14 @@ matrix_appservice_slack_database_port: 5432 matrix_appservice_slack_database_name: matrix_appservice_slack matrix_appservice_slack_database_sslmode: disable +matrix_appservice_slack_puppeting_enabled: false +matrix_appservice_slack_puppeting_slackapp_client_id: '' +matrix_appservice_slack_puppeting_slackapp_client_secret: '' +matrix_appservice_slack_puppeting_onboard_users: true + +matrix_appservice_slack_team_sync_enabled: false +matrix_appservice_slack_team_sync_alias_prefix: 'slack_' + # The name of the container network to use when importing a NeDB database into Postgres. # For Postgres not working in a container, this can be left empty. matrix_appservice_slack_database_container_network: '' diff --git a/roles/custom/matrix-bridge-appservice-slack/templates/config.yaml.j2 b/roles/custom/matrix-bridge-appservice-slack/templates/config.yaml.j2 index 911dd75e4..0d816f708 100644 --- a/roles/custom/matrix-bridge-appservice-slack/templates/config.yaml.j2 +++ b/roles/custom/matrix-bridge-appservice-slack/templates/config.yaml.j2 @@ -24,6 +24,26 @@ rtm: # log_level: "silent" +{% if matrix_appservice_slack_puppeting_enabled %} +puppeting: + enabled: true + onboard_users: {{ matrix_appservice_slack_puppeting_onboard_users|lower }} + +oauth2: + client_id: "{{ matrix_appservice_slack_puppeting_slackapp_client_id }}" + client_secret: "{{ matrix_appservice_slack_puppeting_slackapp_client_secret }}" +{% endif %} + +{% if matrix_appservice_slack_team_sync_enabled %} +team_sync: + all: + channels: + enabled: true + alias_prefix: "{{ matrix_appservice_slack_team_sync_alias_prefix }}" + users: + enabled: true +{% endif %} + {% if matrix_appservice_slack_database_engine == 'nedb' %} dbdir: "/data" {% else %} From 83f5d73bf9b00f689edf17848016f02f6e6ae1b8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 14 May 2024 17:25:29 +0000 Subject: [PATCH 63/69] chore(deps): update ghcr.io/element-hq/synapse docker tag to v1.107.0 --- roles/custom/matrix-synapse/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/custom/matrix-synapse/defaults/main.yml b/roles/custom/matrix-synapse/defaults/main.yml index 0f10ed24b..1bd1346e1 100644 --- a/roles/custom/matrix-synapse/defaults/main.yml +++ b/roles/custom/matrix-synapse/defaults/main.yml @@ -16,7 +16,7 @@ matrix_synapse_enabled: true matrix_synapse_github_org_and_repo: element-hq/synapse # renovate: datasource=docker depName=ghcr.io/element-hq/synapse -matrix_synapse_version: v1.106.0 +matrix_synapse_version: v1.107.0 matrix_synapse_username: '' matrix_synapse_uid: '' From 92e55b39e73871d31fa8d1413081314dda127755 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Tue, 14 May 2024 20:27:47 +0300 Subject: [PATCH 64/69] Use to_json in appservice-slack config.yaml.j2 --- .../templates/config.yaml.j2 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/custom/matrix-bridge-appservice-slack/templates/config.yaml.j2 b/roles/custom/matrix-bridge-appservice-slack/templates/config.yaml.j2 index 0d816f708..10a53fa5f 100644 --- a/roles/custom/matrix-bridge-appservice-slack/templates/config.yaml.j2 +++ b/roles/custom/matrix-bridge-appservice-slack/templates/config.yaml.j2 @@ -27,11 +27,11 @@ rtm: {% if matrix_appservice_slack_puppeting_enabled %} puppeting: enabled: true - onboard_users: {{ matrix_appservice_slack_puppeting_onboard_users|lower }} + onboard_users: {{ matrix_appservice_slack_puppeting_onboard_users | to_json }} oauth2: - client_id: "{{ matrix_appservice_slack_puppeting_slackapp_client_id }}" - client_secret: "{{ matrix_appservice_slack_puppeting_slackapp_client_secret }}" + client_id: {{ matrix_appservice_slack_puppeting_slackapp_client_id | to_json }} + client_secret: {{ matrix_appservice_slack_puppeting_slackapp_client_secret | to_json }} {% endif %} {% if matrix_appservice_slack_team_sync_enabled %} @@ -39,7 +39,7 @@ team_sync: all: channels: enabled: true - alias_prefix: "{{ matrix_appservice_slack_team_sync_alias_prefix }}" + alias_prefix: {{ matrix_appservice_slack_team_sync_alias_prefix | to_json }} users: enabled: true {% endif %} From d24dcb4d28cea32959e39553627f39b4a601036e Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Thu, 16 May 2024 13:55:12 +0300 Subject: [PATCH 65/69] Upgrade Postgres (v16.1-6 -> v16.3-0) --- requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.yml b/requirements.yml index 978af31f6..18cda83c7 100644 --- a/requirements.yml +++ b/requirements.yml @@ -43,7 +43,7 @@ version: ff2fd42e1c1a9e28e3312bbd725395f9c2fc7f16 name: playbook_state_preserver - src: git+https://github.com/devture/com.devture.ansible.role.postgres.git - version: v16.1-6 + version: v16.3-0 name: postgres - src: git+https://github.com/devture/com.devture.ansible.role.postgres_backup.git version: 046004a8cb9946979b72ce81c2526c8033ea8067 From 9fcc4df9130c2d937b6c2ddb4aae7d7e93e24a5a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 16 May 2024 21:33:47 +0000 Subject: [PATCH 66/69] chore(deps): update dock.mau.dev/mautrix/gmessages docker tag to v0.4.1 --- roles/custom/matrix-bridge-mautrix-gmessages/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/custom/matrix-bridge-mautrix-gmessages/defaults/main.yml b/roles/custom/matrix-bridge-mautrix-gmessages/defaults/main.yml index 2088d2bea..b067222aa 100644 --- a/roles/custom/matrix-bridge-mautrix-gmessages/defaults/main.yml +++ b/roles/custom/matrix-bridge-mautrix-gmessages/defaults/main.yml @@ -9,7 +9,7 @@ matrix_mautrix_gmessages_container_image_self_build_repo: "https://github.com/ma matrix_mautrix_gmessages_container_image_self_build_branch: "{{ 'main' if matrix_mautrix_gmessages_version == 'latest' else matrix_mautrix_gmessages_version }}" # renovate: datasource=docker depName=dock.mau.dev/mautrix/gmessages -matrix_mautrix_gmessages_version: v0.4.0 +matrix_mautrix_gmessages_version: v0.4.1 # See: https://mau.dev/mautrix/gmessages/container_registry matrix_mautrix_gmessages_docker_image: "{{ matrix_mautrix_gmessages_docker_image_name_prefix }}mautrix/gmessages:{{ matrix_mautrix_gmessages_version }}" From 72803a89ce3370247fbcbd2c1feeb12dc1060ff3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 16 May 2024 21:33:50 +0000 Subject: [PATCH 67/69] chore(deps): update dock.mau.dev/mautrix/meta docker tag to v0.3.1 --- .../matrix-bridge-mautrix-meta-instagram/defaults/main.yml | 2 +- .../matrix-bridge-mautrix-meta-messenger/defaults/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/custom/matrix-bridge-mautrix-meta-instagram/defaults/main.yml b/roles/custom/matrix-bridge-mautrix-meta-instagram/defaults/main.yml index 97d043736..078b53062 100644 --- a/roles/custom/matrix-bridge-mautrix-meta-instagram/defaults/main.yml +++ b/roles/custom/matrix-bridge-mautrix-meta-instagram/defaults/main.yml @@ -13,7 +13,7 @@ matrix_mautrix_meta_instagram_enabled: true matrix_mautrix_meta_instagram_identifier: matrix-mautrix-meta-instagram # renovate: datasource=docker depName=dock.mau.dev/mautrix/meta -matrix_mautrix_meta_instagram_version: v0.3.0 +matrix_mautrix_meta_instagram_version: v0.3.1 matrix_mautrix_meta_instagram_base_path: "{{ matrix_base_data_path }}/mautrix-meta-instagram" matrix_mautrix_meta_instagram_config_path: "{{ matrix_mautrix_meta_instagram_base_path }}/config" diff --git a/roles/custom/matrix-bridge-mautrix-meta-messenger/defaults/main.yml b/roles/custom/matrix-bridge-mautrix-meta-messenger/defaults/main.yml index f5bc46bdd..67ca3cb1c 100644 --- a/roles/custom/matrix-bridge-mautrix-meta-messenger/defaults/main.yml +++ b/roles/custom/matrix-bridge-mautrix-meta-messenger/defaults/main.yml @@ -13,7 +13,7 @@ matrix_mautrix_meta_messenger_enabled: true matrix_mautrix_meta_messenger_identifier: matrix-mautrix-meta-messenger # renovate: datasource=docker depName=dock.mau.dev/mautrix/meta -matrix_mautrix_meta_messenger_version: v0.3.0 +matrix_mautrix_meta_messenger_version: v0.3.1 matrix_mautrix_meta_messenger_base_path: "{{ matrix_base_data_path }}/mautrix-meta-messenger" matrix_mautrix_meta_messenger_config_path: "{{ matrix_mautrix_meta_messenger_base_path }}/config" From ac40afefff11b87e20df8a8c2db0ec2c2a01cd01 Mon Sep 17 00:00:00 2001 From: aquila Date: Fri, 17 May 2024 11:08:12 +0800 Subject: [PATCH 68/69] Add missing configuration matrix_synapse_ext_synapse_auto_accept_invite_accept_invites_only_from_local_users to specifies whether only invites from local users will be auto accepted. --- roles/custom/matrix-synapse/defaults/main.yml | 2 ++ .../tasks/ext/synapse-auto-accept-invite/setup_install.yml | 1 + 2 files changed, 3 insertions(+) diff --git a/roles/custom/matrix-synapse/defaults/main.yml b/roles/custom/matrix-synapse/defaults/main.yml index 1bd1346e1..0cfb9d30c 100644 --- a/roles/custom/matrix-synapse/defaults/main.yml +++ b/roles/custom/matrix-synapse/defaults/main.yml @@ -1227,6 +1227,8 @@ matrix_synapse_ext_synapse_auto_accept_invite_enabled: false matrix_synapse_ext_synapse_auto_accept_invite_version: 1.1.3 # Specifies whether only direct messages (1:1 rooms) will be auto accepted. matrix_synapse_ext_synapse_auto_accept_invite_accept_invites_only_direct_messages: false +# Specifies whether only invites from local users will be auto accepted. +matrix_synapse_ext_synapse_auto_accept_invite_accept_invites_only_from_local_users: false # When Synapse workers enabled it is possible (but not required) to assign a worker to run this module on (null = main process). matrix_synapse_ext_synapse_auto_accept_invite_worker_to_run_on: null diff --git a/roles/custom/matrix-synapse/tasks/ext/synapse-auto-accept-invite/setup_install.yml b/roles/custom/matrix-synapse/tasks/ext/synapse-auto-accept-invite/setup_install.yml index 06457e370..182d42b03 100644 --- a/roles/custom/matrix-synapse/tasks/ext/synapse-auto-accept-invite/setup_install.yml +++ b/roles/custom/matrix-synapse/tasks/ext/synapse-auto-accept-invite/setup_install.yml @@ -10,6 +10,7 @@ "module": "synapse_auto_accept_invite.InviteAutoAccepter", "config": { "accept_invites_only_for_direct_messages": matrix_synapse_ext_synapse_auto_accept_invite_accept_invites_only_direct_messages, + "accept_invites_only_from_local_users": matrix_synapse_ext_synapse_auto_accept_invite_accept_invites_only_from_local_users, "worker_to_run_on": matrix_synapse_ext_synapse_auto_accept_invite_worker_to_run_on, }, }] From 515eb416910a17492a5610806e3ce8904547cdf4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 17 May 2024 04:43:46 +0000 Subject: [PATCH 69/69] chore(deps): update dock.mau.dev/mautrix/signal docker tag to v0.6.1 --- roles/custom/matrix-bridge-mautrix-signal/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/custom/matrix-bridge-mautrix-signal/defaults/main.yml b/roles/custom/matrix-bridge-mautrix-signal/defaults/main.yml index ebb048521..d3bc23a78 100644 --- a/roles/custom/matrix-bridge-mautrix-signal/defaults/main.yml +++ b/roles/custom/matrix-bridge-mautrix-signal/defaults/main.yml @@ -9,7 +9,7 @@ matrix_mautrix_signal_container_image_self_build_repo: "https://mau.dev/mautrix/ matrix_mautrix_signal_container_image_self_build_branch: "{{ 'main' if matrix_mautrix_signal_version == 'latest' else matrix_mautrix_signal_version }}" # renovate: datasource=docker depName=dock.mau.dev/mautrix/signal -matrix_mautrix_signal_version: v0.6.0 +matrix_mautrix_signal_version: v0.6.1 # See: https://mau.dev/mautrix/signal/container_registry matrix_mautrix_signal_docker_image: "{{ matrix_mautrix_signal_docker_image_name_prefix }}mautrix/signal:{{ matrix_mautrix_signal_docker_image_tag }}"