commit 16c33399bd7db8604590c947cd0f143beefbacfa
parent 05e32463e12f1012c04844c1a1e2298cf54d19fd
Author: MTRNord <mtrnord1@gmail.com>
Date: Thu, 27 Feb 2025 19:47:12 +0100
Try to fix synapse routing
Diffstat:
4 files changed, 52 insertions(+), 16 deletions(-)
diff --git a/apps/base/matrix/draupnir-fluffy/deployment.yaml b/apps/base/matrix/draupnir-fluffy/deployment.yaml
@@ -31,7 +31,7 @@ spec:
app: mjolnir-fluffy
spec:
containers:
- - image: gnuxie/draupnir:v2.0.0
+ - image: gnuxie/draupnir:v2.1.0
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 3
diff --git a/apps/base/matrix/draupnir-freifunk/deployment.yaml b/apps/base/matrix/draupnir-freifunk/deployment.yaml
@@ -31,7 +31,7 @@ spec:
app: mjolnir-freifunk
spec:
containers:
- - image: gnuxie/draupnir:v2.0.0
+ - image: gnuxie/draupnir:v2.1.0
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 3
diff --git a/apps/base/matrix/draupnir-synapse/release.yaml b/apps/base/matrix/draupnir-synapse/release.yaml
@@ -109,7 +109,7 @@ spec:
emptyDir: {}
- name: configs
secret:
- secretName: ENC[AES256_GCM,data:m7x2Z3oCmA6xIRqbkrccx91eNA==,iv:TsKqYTJLDiFtnH0TmLOsFLlwEdNg1r8hJYZdkhtWOGo=,tag:0SXGKKpLh0yUSHcqQ+aKcg==,type:str]
+ secretName: ENC[AES256_GCM,data:m7x2Z3oCmA6xIRqbkrccx91eNA==,iv:TsKqYTJLDiFtnH0TmLOsFLlwEdNg1r8hJYZdkhtWOGo=,tag:0SXGKKpLh0yUSHcqQ+aKcg==,type:str]
extraConfig:
opentracing:
enabled: false
@@ -140,31 +140,67 @@ spec:
listeners:
- client
csPaths:
+ # Sync requests
+ - /_matrix/client/(r0|v3)/sync$
+ - /_matrix/client/(api/v1|r0|v3)/events$
+ - /_matrix/client/(api/v1|r0|v3)/initialSync$
+ - /_matrix/client/(api/v1|r0|v3)/rooms/[^/]+/initialSync$
# Client API requests
- /_matrix/client/(api/v1|r0|v3|unstable)/createRoom$
- /_matrix/client/(api/v1|r0|v3|unstable)/publicRooms$
+ - /_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/joined_members$
+ - /_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/context/.*$
+ - /_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/members$
- /_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/state$
+ - /_matrix/client/v1/rooms/.*/hierarchy$
+ - /_matrix/client/(v1|unstable)/rooms/.*/relations/.*
+ - /_matrix/client/v1/rooms/.*/threads$
+ - /_matrix/client/unstable/im.nheko.summary/summary/.*$
+ - /_matrix/client/(r0|v3|unstable)/account/3pid$
- /_matrix/client/(r0|v3|unstable)/account/whoami$
- /_matrix/client/(r0|v3|unstable)/devices$
- /_matrix/client/versions$
+ - /_matrix/client/(api/v1|r0|v3|unstable)/voip/turnServer$
- /_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/event/.*
- /_matrix/client/(api/v1|r0|v3|unstable)/joined_rooms$
+ - /_matrix/client/v1/rooms/.*/timestamp_to_event$
+ - /_matrix/client/(api/v1|r0|v3|unstable/.*)/rooms/.*/aliases.*
+ - /_matrix/client/(api/v1|r0|v3|unstable)/search$
+ - /_matrix/client/(r0|v3|unstable)/user/.*/filter(/.*|$)
+ - /_matrix/client/(api/v1|r0|v3|unstable)/directory/room/.*$
+ - /_matrix/client/(r0|v3|unstable)/capabilities$
+ - /_matrix/client/(r0|v3|unstable)/notifications$
# Encryption requests
- /_matrix/client/(r0|v3|unstable)/keys/query$
- /_matrix/client/(r0|v3|unstable)/keys/changes$
- /_matrix/client/(r0|v3|unstable)/keys/claim$
- /_matrix/client/(r0|v3|unstable)/room_keys/.*
- /_matrix/client/(r0|v3|unstable)/keys/upload/.*
- # Registration/login requests
- - /_matrix/client/(r0|v3|unstable)/register$
- - /_matrix/client/(r0|v3|unstable)/register/available$
+ # Registration/login requests are done by MAS.
# Event sending requests
- /_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/redact.*
- /_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/send.*
- - /_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/state/
+ - /_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/state/.*
- /_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/(join|invite|leave|ban|unban|kick)$
- /_matrix/client/(api/v1|r0|v3|unstable)/join/.*
+ - /_matrix/client/(api/v1|r0|v3|unstable)/knock/.*
- /_matrix/client/(api/v1|r0|v3|unstable)/profile/.*
+ # # User directory search requests
+ - /_matrix/client/(r0|v3|unstable)/user_directory/search$
+ # Worker event streams
+ # See https://matrix-org.github.io/synapse/latest/workers.html#stream-writers
+ # hopefully no stream
+ - ^/_matrix/client/unstable/org.matrix.msc4140/delayed_events.*
+ # The pushrules event stream
+ # - ^/_matrix/client/(api/v1|r0|v3|unstable)/pushrules/
+ # The account_data event stream
+ # - /_matrix/client/(r0|v3|unstable)/.*/tags
+ # - /_matrix/client/(r0|v3|unstable)/.*/account_data
+ # The receipts event stream
+ # - /_matrix/client/(r0|v3|unstable)/rooms/.*/receipt
+ # - /_matrix/client/(r0|v3|unstable)/rooms/.*/read_markers
+ # The presence event stream
+ # - /_matrix/client/(api/v1|r0|v3|unstable)/presence/
federation_reader:
resources:
requests:
@@ -267,7 +303,7 @@ spec:
emptyDir: {}
- name: configs
secret:
- secretName: ENC[AES256_GCM,data:aVOK2h6KTIKNX8Ypa+AF2UOITA==,iv:PIyZ94Tfr84QUqut2oFu09bYRGwJiKpEpfBmWtQZNXE=,tag:QZflZ3hovkN5a1Bs5S4oMg==,type:str]
+ secretName: ENC[AES256_GCM,data:aVOK2h6KTIKNX8Ypa+AF2UOITA==,iv:PIyZ94Tfr84QUqut2oFu09bYRGwJiKpEpfBmWtQZNXE=,tag:QZflZ3hovkN5a1Bs5S4oMg==,type:str]
## Liveness probe configuration to use
##
livenessProbe:
@@ -338,13 +374,13 @@ sops:
age:
- recipient: age1esjyg2qfy49awv0ptkzvpk425adczjr38m37w2mmcahzc4p8n54sll2nzh
enc: |
- -----BEGIN AGE ENCRYPTED FILE-----
- YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2dFpjM1lmcllpR0RKdXdv
- bTAydDBWbVRoRXhDUjRwc0FxcjdNU1VNalNJCjcwWE9mQnUydU9QdGZNVWRvSk5k
- NWRiY1diZy9XRkgxaEgycVp5ZHgyQlkKLS0tIFNtbFJRdm5lMklZUS9FL0xrMW5F
- RUwrQmhKTlRLVjk3QlRxQ3pUb3pEMHcKRT/WEzTcOmlzlvMT5ddT82d8inRAgvyQ
- qom+xJO9SM2jcej4kl+0cMJ8zqsrXmw7PukTLjKXOh6egmw+p6qMpQ==
- -----END AGE ENCRYPTED FILE-----
+ -----BEGIN AGE ENCRYPTED FILE-----
+ YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2dFpjM1lmcllpR0RKdXdv
+ bTAydDBWbVRoRXhDUjRwc0FxcjdNU1VNalNJCjcwWE9mQnUydU9QdGZNVWRvSk5k
+ NWRiY1diZy9XRkgxaEgycVp5ZHgyQlkKLS0tIFNtbFJRdm5lMklZUS9FL0xrMW5F
+ RUwrQmhKTlRLVjk3QlRxQ3pUb3pEMHcKRT/WEzTcOmlzlvMT5ddT82d8inRAgvyQ
+ qom+xJO9SM2jcej4kl+0cMJ8zqsrXmw7PukTLjKXOh6egmw+p6qMpQ==
+ -----END AGE ENCRYPTED FILE-----
lastmodified: "2025-01-18T16:41:05Z"
mac: ENC[AES256_GCM,data:bejkU903B5B+O8+zzTa0Rypwfq29N94yWBw9/kOf/XByJZYdsCtC6kYX6G/QLwPRRvKuONYEozAxqFbiTqkR1NVyzqDf8Oj+KEXtQBf3P0SY334yCmaeajHLlKm6kanD5NnpVSmX3BcuVfTGwQK3jZ+Kab+cDNu4/AGqw+6Vnxg=,iv:vg1mrpIUNny4WqqS666kM4yvZpI0TuL7ViSP+ib7HVM=,tag:JF0OdVZino0cP0+Bmx+slw==,type:str]
pgp: []
diff --git a/apps/base/matrix/draupnir4all/deployment.yaml b/apps/base/matrix/draupnir4all/deployment.yaml
@@ -48,7 +48,7 @@ spec:
topologyKey: "kubernetes.io/hostname"
containers:
- name: draupnir4all
- image: gnuxie/draupnir:v2.0.0
+ image: gnuxie/draupnir:v2.1.0
imagePullPolicy: IfNotPresent
#image: ghcr.io/mtrnord/cluster/draupnir:d4all
#imagePullPolicy: Always