commit 34b5e6f909044884688b340185c1056d6d8ebca7
parent a8ea2cabb0a834ba44e31bd2b2547d2102db945e
Author: MTRNord <mtrnord1@gmail.com>
Date: Sat, 18 Jan 2025 15:02:44 +0100
Meow
Diffstat:
1 file changed, 23 insertions(+), 41 deletions(-)
diff --git a/apps/base/matrix/synapse/release.yaml b/apps/base/matrix/synapse/release.yaml
@@ -79,10 +79,10 @@ spec:
msc3861:
enabled: true
issuer: https://mas.matrix.midnightthoughts.space/
- client_id: ENC[AES256_GCM,data:YfRX4ggPbsJGdrA/0eWFDhuVbLELmUUCXK4=,iv:MZ0RDQKWIBqsPtA185dGt7uIU1Vx1A5MjS02LgfWJUo=,tag:W9yERZNl+tzg6Ox4cXAtOA==,type:str]
+ client_id: ENC[AES256_GCM,data:vmG2eVsiaL7poQUE8/9Woec0cOAbsl3ZZr8=,iv:gXZ90WeD7NxlmQfFvMRi3G8S+YRl1+LCG5dMqg74Hs0=,tag:yWJqT3F5x4224fBiLRLEiQ==,type:str]
client_auth_method: client_secret_basic
- client_secret: ENC[AES256_GCM,data:0Ru3JsrkjgIo5kijfHnFcYi6IN5yDRWbTrz2F7/SN8Kpw6+qiGqbLQwd1skyxBx16+12bX2Cu0fgBIQR1t5kTQ==,iv:z+QUKlLm+L+Kh03DSP4u2uYNmjv5+4Q19QifJbA/AvQ=,tag:2X8W++We8+2zUniPRjgeAQ==,type:str]
- admin_token: ENC[AES256_GCM,data:G4MdcT/dY9HfVm4h1nYxAiDDg6Mx3TiKHXnzZzfcTm0=,iv:wmSsmDHcLYkg2GOv/XP2VtFmUMQSqUiF/lx8YNJa0mM=,tag:Bd0RYOtxg9eRweZL2KQBeA==,type:str]
+ client_secret: ENC[AES256_GCM,data:u54jLjjX7rCEDETdgqxGHGQbGrLmNfjcu0NET43qy6hUGCY3IOG8qMB5jAP+7QrKuP9FSQBPQVHaJSSs0a9/rg==,iv:Kz24XXEJAd2c3ZV8SPoEBKVvqHhS7IL2+nplIgvxqFk=,tag:94v+9s4PrwZ2lhLEQblJpg==,type:str]
+ admin_token: ENC[AES256_GCM,data:nj/XE7vgPDuO9yIggZlsQYyoOxmCXVfzIEOwrHsB9qc=,iv:l9MhyttA9Gajq/h7Fbf/zbSxogkGLF2I0hh3YVT0mKE=,tag:A1+3HWi1gcYjGAjALhcTHA==,type:str]
account_management_url: https://mas.matrix.midnightthoughts.space/account
event_cache_size: 30K
caches:
@@ -122,7 +122,7 @@ spec:
- name: matrix-org-blocker
mountPath: /usr/local/lib/python3.11/site-packages/matrix_invitee_server_blocker
extraCommands:
- - ENC[AES256_GCM,data:5BGwvCZlWzO/ODD+eyRJzAFrvbciOUO5cs6wzMfRpXREK+u63WM3fYyvHvhBCg6RAwFrq8rqt4d35PGNymKCPHafBXblI5S+yItFlQyeKGudQtLWwguHTjF/rujQz/Wg1Mqk+6mzYY3mtNDDhivu5h2+cy3gvN0y3jr9+wqh3NX9azcerR8U4B1X+SUi0iM5RuwQHZGg4drZgpNHTg==,iv:zuuMFdcuXv/GzU3+jmsy8i5/2Ivv5y4dMha/a3yUhEU=,tag:Q4Hwt8vNU1CFXtejVQMaUQ==,type:str]
+ - ENC[AES256_GCM,data:XfRCK/sZLuScFZq7LjzlxqN306u2GKp93nt2RyZ83YBc0Mi3aK3U3zjHRJMQI7/Dj5SthCSCzie64br8Xxn2TOKWoxt4NaxPH0rMGugNJhclCwrP7zbImcYqvcfodEzQX3FlOxo2DstvuQ723Y6FJyJSqIeiGEZSFJE0cjkMXXkcIMgTVYtwNOj70K1Ntp0xJ7qyjry23Tr933KyKA==,iv:f+rPAI+6mQiIwRpb4U8f79rPnWmJeYEMWewCgNmba14=,tag:LVEBca2gHZfL4opZfmZ9qQ==,type:str]
extraConfig:
enable_authenticated_media: true
event_cache_size: 30K
@@ -311,7 +311,7 @@ spec:
- name: matrix-org-blocker
mountPath: /usr/local/lib/python3.11/site-packages/matrix_invitee_server_blocker
extraCommands:
- - ENC[AES256_GCM,data:xzPIMLrAHU7cSdac373fiQm3niJDHObtRXRTngC7/1iFMzVa5sDg3s9bbPqBGQKglqEWBA6qH1SdDBFAU3bkPq9p3jGXK4GLefh5BRZCaK4pa78cqxk6ZOiHbhVUPfOhb81/bmMfESWilm0XvQnbG0gF9bPy+gr1O7Xpw/rsXNG/U/aQebGX/cIDPXOR3SHSt1GxURpeyOTLMTb65g==,iv:3zCjjx2i6tCRXvfN+KuIdYyEQ+QySCxJ6Um5ar11360=,tag:1Xfh5Q07mx6toOcVtFDGpg==,type:str]
+ - ENC[AES256_GCM,data:5ZAWuJzqERnMIJvCPZoCDdpKCm8+vCpgGBTQFEQHw7UcvMBn3odAoHCohUorP0iDiiGV0cVDKVYKPGVSaoLxo0wremFW8ndqSElh90peVhjTUIwvObN/ZMJN61tGUw7mdO80vjgS9D7Y15Kp2FEEkZdRkC1/dmUIr2XBn/AosgHUb6/j6q06r9qAmP6+DQWcwx+uNTR4Hol75WX1Gw==,iv:JYFsq0tGDyMEjNSxq0hAE5jLhAGaD2Yr3PuC5x/Q7DU=,tag:yQqbMkPR30ql/vXELSHWyQ==,type:str]
annotations:
prometheus.io/scrape: "true"
prometheus.io/path: /_synapse/metrics
@@ -335,12 +335,15 @@ spec:
sslmode: require
username: synapse
database: synapse
- password: ENC[AES256_GCM,data:dGMp/0+/oPImBuR5Brtp4eL7PfFlB3gDVHO6G+1UuF7bo9jSsMXTlTUZf2D8cS2hUnUG+d923o95hBtqK9ezZQ==,iv:JCCku4n8cyj++KWGm8/G7TP7SOZpm9hBU86Y4quvdps=,tag:ZHOk/dYRdaVObr6t+4LszA==,type:str]
+ password: ENC[AES256_GCM,data:gxLENU3KwM56l6Lkci52iAUeCAAPpwJTuvSplq7C4ZroG0h+1j0ihHmLl3yWUlADCMBkBemiiZrh2DJ+SPOt3w==,iv:yenZi4a6zD3xaGoU+x0erG4CNDAoU4nbW//IMe8e4bg=,tag:6gBvF50LejOa6SX8ZENVjw==,type:str]
gateway:
parentRefs:
- name: envoy-gateway
namespace: envoy-gateway
enabled: true
+ timeouts:
+ request: 60s
+ backendRequest: 60s
hosts:
- midnightthoughts.space
- matrix.midnightthoughts.space
@@ -355,27 +358,6 @@ spec:
value: /_matrix/client/.*/(login|logout|refresh)
ingress:
enabled: false
- traefikPaths: false
- hosts:
- - midnightthoughts.space
- - matrix.midnightthoughts.space
- tls:
- - hosts:
- - midnightthoughts.space
- - matrix.midnightthoughts.space
- secretName: midnightthoughts-synapse-tls-secret
- annotations:
- cert-manager.io/cluster-issuer: letsencrypt-dns
- external-dns.alpha.kubernetes.io/hostname: midnightthoughts.space
- traefik.ingress.kubernetes.io/router.pathmatcher: PathRegexp
- csPaths:
- - path: /_matrix/client/.*/(login|logout|refresh)
- pathType: ImplementationSpecific
- backend:
- service:
- name: mas
- port:
- number: 8080
sops:
kms: []
gcp_kms: []
@@ -385,14 +367,14 @@ sops:
- recipient: age1esjyg2qfy49awv0ptkzvpk425adczjr38m37w2mmcahzc4p8n54sll2nzh
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
- YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzZGJucXlnb0lnZ1RGMTJD
- M1BER2VGalFVSEcwd1B4cGR3WGxUYWZoTkJNClJkTHlsdTI0MEZSczdyRCs0UHpO
- RlA3MXd4WG5udjdJZFN4b2ZDb3FxK2sKLS0tIEc2MjV4WlVZemVJVjQrZmVyQVBT
- MzhkQkQvN3Ewemx0KzVsRTFhQ1R1SnMKwtcU0QGzQ4LS3TZxl6y4rKGxPbDF3uWe
- XXdd838gQm6ArTLrE/8l8IJ3sNVoDow1p38KbmVaewD9ElwxxZa3zA==
+ YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzNnU2QzQxaDRUSzZweitZ
+ cGRqZ2tVbzcyaDgxK25YR3VBd05vdjErTzBzCnhoUUtLQjJNUFcvS3gwZWFHQTRX
+ SlRYbktmZHB3NUZVTGkraVpGbDFuRGsKLS0tIEhzUVp0eGFpS0x3b0Iwa0wyblha
+ aVpTQ3NvSmNTaUlkRGRBZyt3NTFIOVUKfMOuzBi39ih3KEp1e8AYxMyBFs/lfoAT
+ tBfnztH7yg4wKeey33TVfutV9fOOBsh8jH3qxPHbByqRZJUFJPWkQw==
-----END AGE ENCRYPTED FILE-----
- lastmodified: "2025-01-18T13:38:26Z"
- mac: ENC[AES256_GCM,data:do47RkZZnfXTszb76PN2P1CE7AOwzmAKxxuU4ef8l0Bfg/XDvcwZim6SHoxwa/0HhyiCC97pWJUqpB2oz28/4LDltwXaqeqI3T6jLVtuLnviLKxh9OBu5FVM5RzNM5zwtYdtmo+b//i8WltmfpuSBzcCtDrf209koJ5plJfQK2U=,iv:GshzwGaSi3zpZTxckweHnLL0Q5a7S6sWBaa6fOcr3r4=,tag:2r0H5UvEaoQFp8IM82KgVg==,type:str]
+ lastmodified: "2025-01-18T14:02:39Z"
+ mac: ENC[AES256_GCM,data:cqQ7aC03mgh+oBcOYywJo+gqAY+SybgqRmgbCgbZ1mDs0boNfLEAVV4PjuaEutA5Wcq2046rE4gedcUDqxZJpznJquQ0Pcf1oH2pQ/qWSIiOKPf7deeWF5QjClKsg6s+LObdpHpg2QTuOzzwm45guvf40kqlwQQCSi5WVTRlu5g=,iv:lnT8jDGhm1UfrwHp11s5y1W5zkNEoddRn+j/xSq38Io=,tag:K7NfHNUev8C2KjY81QOE4g==,type:str]
pgp: []
encrypted_regex: ^(adminPassword|adminEmail|jenkinsAdminEmail|securityRealm|gerrit.config|routing_key|DATABASE_URL|SMTP_PASSWORD|SECRET_KEY_BASE|admin_password|extraCommands|key|clickhouseDatabaseURL|databaseURL|client_id|client_secret|secret_key_base|otp_secret|private_key|public_key|primaryKey|deterministicKey|keyDerivationSalt|token|clientId|secretKey|installationId|installationKey|uriOverride|adminToken.value|password.value|sql_password|erlangCookie|AUTHENTICATION_PASSWORD|ROOM_API_SECRET_KEY|adminPassword|configPassword|adminUser|configUser|MAIL_PASSWORD|APP_KEY|api_key|api_secret|keys|livekit_key|livekit_secret|secret_key|admin_pass|admin_email|mariadbPassword|mariadbRootPassword|privateKey|data|stringData|PASSWD|password|pass|postgresPassword|postgresqlPassword|redminePassword|smtpPassword|registration_shared_secret|shared_secret|secret|admin_token|integrationKey|rootPassword)$
version: 3.9.1
@@ -428,14 +410,14 @@ sops:
- recipient: age1esjyg2qfy49awv0ptkzvpk425adczjr38m37w2mmcahzc4p8n54sll2nzh
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
- YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzZGJucXlnb0lnZ1RGMTJD
- M1BER2VGalFVSEcwd1B4cGR3WGxUYWZoTkJNClJkTHlsdTI0MEZSczdyRCs0UHpO
- RlA3MXd4WG5udjdJZFN4b2ZDb3FxK2sKLS0tIEc2MjV4WlVZemVJVjQrZmVyQVBT
- MzhkQkQvN3Ewemx0KzVsRTFhQ1R1SnMKwtcU0QGzQ4LS3TZxl6y4rKGxPbDF3uWe
- XXdd838gQm6ArTLrE/8l8IJ3sNVoDow1p38KbmVaewD9ElwxxZa3zA==
+ YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzNnU2QzQxaDRUSzZweitZ
+ cGRqZ2tVbzcyaDgxK25YR3VBd05vdjErTzBzCnhoUUtLQjJNUFcvS3gwZWFHQTRX
+ SlRYbktmZHB3NUZVTGkraVpGbDFuRGsKLS0tIEhzUVp0eGFpS0x3b0Iwa0wyblha
+ aVpTQ3NvSmNTaUlkRGRBZyt3NTFIOVUKfMOuzBi39ih3KEp1e8AYxMyBFs/lfoAT
+ tBfnztH7yg4wKeey33TVfutV9fOOBsh8jH3qxPHbByqRZJUFJPWkQw==
-----END AGE ENCRYPTED FILE-----
- lastmodified: "2025-01-18T13:38:26Z"
- mac: ENC[AES256_GCM,data:do47RkZZnfXTszb76PN2P1CE7AOwzmAKxxuU4ef8l0Bfg/XDvcwZim6SHoxwa/0HhyiCC97pWJUqpB2oz28/4LDltwXaqeqI3T6jLVtuLnviLKxh9OBu5FVM5RzNM5zwtYdtmo+b//i8WltmfpuSBzcCtDrf209koJ5plJfQK2U=,iv:GshzwGaSi3zpZTxckweHnLL0Q5a7S6sWBaa6fOcr3r4=,tag:2r0H5UvEaoQFp8IM82KgVg==,type:str]
+ lastmodified: "2025-01-18T14:02:39Z"
+ mac: ENC[AES256_GCM,data:cqQ7aC03mgh+oBcOYywJo+gqAY+SybgqRmgbCgbZ1mDs0boNfLEAVV4PjuaEutA5Wcq2046rE4gedcUDqxZJpznJquQ0Pcf1oH2pQ/qWSIiOKPf7deeWF5QjClKsg6s+LObdpHpg2QTuOzzwm45guvf40kqlwQQCSi5WVTRlu5g=,iv:lnT8jDGhm1UfrwHp11s5y1W5zkNEoddRn+j/xSq38Io=,tag:K7NfHNUev8C2KjY81QOE4g==,type:str]
pgp: []
encrypted_regex: ^(adminPassword|adminEmail|jenkinsAdminEmail|securityRealm|gerrit.config|routing_key|DATABASE_URL|SMTP_PASSWORD|SECRET_KEY_BASE|admin_password|extraCommands|key|clickhouseDatabaseURL|databaseURL|client_id|client_secret|secret_key_base|otp_secret|private_key|public_key|primaryKey|deterministicKey|keyDerivationSalt|token|clientId|secretKey|installationId|installationKey|uriOverride|adminToken.value|password.value|sql_password|erlangCookie|AUTHENTICATION_PASSWORD|ROOM_API_SECRET_KEY|adminPassword|configPassword|adminUser|configUser|MAIL_PASSWORD|APP_KEY|api_key|api_secret|keys|livekit_key|livekit_secret|secret_key|admin_pass|admin_email|mariadbPassword|mariadbRootPassword|privateKey|data|stringData|PASSWD|password|pass|postgresPassword|postgresqlPassword|redminePassword|smtpPassword|registration_shared_secret|shared_secret|secret|admin_token|integrationKey|rootPassword)$
version: 3.9.1