aboutsummaryrefslogtreecommitdiff
path: root/cluster/prod/app/matrix
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2023-03-24 11:29:14 +0100
committerAlex Auvolat <alex@adnab.me>2023-03-24 11:29:14 +0100
commit5cd69a9ba1c2f87d9a1e294f06b74945e745e475 (patch)
treef7c8eb63da349c22ed9216ecf088f2a6a14431de /cluster/prod/app/matrix
parent6ffaa0ed91a6e2e4ecec6741677ad9307dcdbab2 (diff)
parent8e29ee3b0b2f1855a26bc45e5dc502f8aad8e266 (diff)
downloadnixcfg-wgautomesh.tar.gz
nixcfg-wgautomesh.zip
Merge branch 'main' into wgautomeshwgautomesh
Diffstat (limited to 'cluster/prod/app/matrix')
-rw-r--r--cluster/prod/app/matrix/build/docker-compose.yml10
-rw-r--r--cluster/prod/app/matrix/config/synapse/homeserver.yaml2
-rw-r--r--cluster/prod/app/matrix/deploy/im.hcl6
3 files changed, 9 insertions, 9 deletions
diff --git a/cluster/prod/app/matrix/build/docker-compose.yml b/cluster/prod/app/matrix/build/docker-compose.yml
index 05bb91c..18a4fea 100644
--- a/cluster/prod/app/matrix/build/docker-compose.yml
+++ b/cluster/prod/app/matrix/build/docker-compose.yml
@@ -6,18 +6,18 @@ services:
context: ./riotweb
args:
# https://github.com/vector-im/riot-web/releases
- VERSION: 1.11.12
- image: superboum/amd64_riotweb:v32
+ VERSION: 1.11.25
+ image: superboum/amd64_riotweb:v33
synapse:
build:
context: ./matrix-synapse
args:
# https://github.com/matrix-org/synapse/releases
- VERSION: 1.70.0
+ VERSION: 1.79.0
# https://github.com/matrix-org/synapse-s3-storage-provider/commits/main
# Update with the latest commit on main each time you update the synapse version
# otherwise synapse may fail to launch due to incompatibility issues
# see this issue for an example: https://github.com/matrix-org/synapse-s3-storage-provider/issues/64
- S3_VERSION: 40c6a5599b2d8176318003f84b167ea545cebba3
- image: superboum/amd64_synapse:v55
+ S3_VERSION: v1.2.0
+ image: superboum/amd64_synapse:v56
diff --git a/cluster/prod/app/matrix/config/synapse/homeserver.yaml b/cluster/prod/app/matrix/config/synapse/homeserver.yaml
index 78eb913..aac8709 100644
--- a/cluster/prod/app/matrix/config/synapse/homeserver.yaml
+++ b/cluster/prod/app/matrix/config/synapse/homeserver.yaml
@@ -450,7 +450,7 @@ presence:
enabled: false
limit_remote_rooms:
enabled: true
- complexity: 3.0
+ complexity: 10.0
complexity_error: "Ce salon de discussion a trop d'activité, le serveur n'est pas assez puissant pour le rejoindre. N'hésitez pas à remonter l'information à l'équipe technique, nous pourrons ajuster la limitation au besoin."
admins_can_join: false
retention:
diff --git a/cluster/prod/app/matrix/deploy/im.hcl b/cluster/prod/app/matrix/deploy/im.hcl
index 5bc6e13..0d5387e 100644
--- a/cluster/prod/app/matrix/deploy/im.hcl
+++ b/cluster/prod/app/matrix/deploy/im.hcl
@@ -14,7 +14,7 @@ job "matrix" {
driver = "docker"
config {
- image = "superboum/amd64_synapse:v55"
+ image = "superboum/amd64_synapse:v56"
network_mode = "host"
readonly_rootfs = true
ports = [ "api_port" ]
@@ -98,7 +98,7 @@ job "matrix" {
driver = "docker"
config {
- image = "superboum/amd64_synapse:v55"
+ image = "superboum/amd64_synapse:v56"
readonly_rootfs = true
command = "/usr/local/bin/matrix-s3-async"
work_dir = "/tmp"
@@ -142,7 +142,7 @@ EOH
task "server" {
driver = "docker"
config {
- image = "superboum/amd64_riotweb:v32"
+ image = "superboum/amd64_riotweb:v33"
ports = [ "web_port" ]
volumes = [
"secrets/config.json:/srv/http/config.json"