commit c40d9a8f65338377223ce0d5b4ebdc0c892448af
parent fff55f4ff49bacf158c3fc00457740f9aa22cc81
Author: MTRNord <mtrnord1@gmail.com>
Date: Sat, 12 Apr 2025 20:05:44 +0200
Maybe fix matrix
Diffstat:
4 files changed, 84 insertions(+), 93 deletions(-)
diff --git a/apps/2024_cluster/secrets/heisenbridge.yaml b/apps/2024_cluster/secrets/heisenbridge.yaml
@@ -1,6 +1,6 @@
apiVersion: v1
stringData:
- heisenbridge.yaml: ENC[AES256_GCM,data:B4jnCHE8qnuvvUXq+Src4HWgXjzFTvDtAB+PfYXVtSLqjxJMaeVK8EE8iFVRO6dqzXun4PQII/BX216m8Oj4cjUZfLY6uG1I2j/ZBtgYjG6waRqpqxodozTeFY3htECo468NH930aj+zF89Apa/vqVwAEx97s8uYjIHKBWYYDxjopypTbOBYuXrU0kO0YPagmI/doHRLtMtBBF4uGAP7g5JU0pzX9VHfwt0EO72sKxu6VWdbjEmq3fn7byhNOb11HD6U2wOPSKorqTaaY75DkHTIvUvZjiB4tv9zBVKSsN8rpQPQX3BC2mVWlyDZU+GeSTdgG3aC1aNBJD7MsPMzVBydx+AG/0LFDMD2MQqeisJCOO0iH4gf6w8/UIh7bIm51INxec84ZBhnNB0kVMG9ieJEoCicfUJh4YEg3wCaJVhQn4DpMBeReXcjW5AqhRcFClyf6Tlv9Q6M7COQdK0cdigc+Ddi0QXcNTvNl/XcgseP1TBR,iv:WiQkyNWE9SuQREs34ITn7HsU+Is7AclqwqXNkO6v/RE=,tag:UH7RJ93+E3aNV4W+d4jhYA==,type:str]
+ heisenbridge.yaml: ENC[AES256_GCM,data:Pdx9VensSCfIop/OsKVkNIW5oVPgdg2C65BAaeNR7BUH9zn8aJLxjMxN/ZJeVPzRj2mnYCq2xilPFUrVbIQOiVCpX+bOT01GHjMC022u3nZZFaOHGsUXaVlxvat+BqA2AOdPJgv4KZ3sO3TlBIyg59CzSBhjqN93gYkm/uSCVwq3SntqORdqsPPHYK2/CqWHnDc/KnB1E5EABUwDXu449vAAx2eQ9cvPmIicDD4Pq1slB+yUU1gj8s8fcsQprpDi6h0fyKunUdRppkeBVdYRH/jDckTSU/jkG7AH22xro3yJbuF+vtO/OISSyMtAWUGczqAR62xssaoujv4fMpHSiTrGvXQnizQPg/JVHEtYTwoCC6EB0chyFiBmbe4EPHZeF9acTru2WfWclJXkPv1CGBpWi3g8iyvxu+Pm7bb65WUOfHTvm3tXm9wqgwlbArZI/z0VhCNfU9DNcb5szw97atmcO/WI2FmyR0ITrrsC2KRs4di3dQk6y5T7WA==,iv:yyZ07dkX8Krgs2BuMxVLhotKhFYQTOmRcVsYDSNJmUM=,tag:6cSDubZCbnKOCtfcLD+DnA==,type:str]
kind: Secret
metadata:
name: heisenbridge
@@ -14,14 +14,14 @@ sops:
- recipient: age1esjyg2qfy49awv0ptkzvpk425adczjr38m37w2mmcahzc4p8n54sll2nzh
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
- YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB1dFhhTzFpMHA1bEt4ZlYz
- K3hmbUhVUVJFcXpoemVaRVExeDJZd1lDNFM4CmNjSlc2bHI0Wk5yaVc2dzR4blBN
- alNVa1hBZzh2cDMwcmx3ZWdpbU1tVDQKLS0tIE5Fb0JjWldwL2dwU1dYTnhML3RI
- MStPMFBFZkJiUlkvUnVtTVBxalBYU3MKvcQghCIVAfdru0N4/MQPNZB1yFKaSRZp
- sJWdZoNt1qBk5pJsADUoSv9zk1gpkp2x+vYAbASnTPCy6IxM2jJpjg==
+ YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBwem9NSVV1YVZtb1Q3S0M0
+ NnJkL0J4dk1sYjk5U3pCRERBM3FsZHMwdWdvCjdnbllUTGdPT3czMEZjSzAxTis4
+ VE5FU3dTdmZrZEpJVE45dDdOQyt5SEUKLS0tIFA1V1NzQU1LQnk5ZUM3cEgyMVB4
+ SkR3V2lkUndTd3BqVlUvVDNhS01UcEEKqY9BYBtKT1lmugQ+N1O6C4Hv0otqFtDm
+ Hxl/zF3jGh6QSl03eDj/5QgU1zBEI1KIyR0GNntPSq6DBlZdJ6C61A==
-----END AGE ENCRYPTED FILE-----
- lastmodified: "2025-04-12T17:59:14Z"
- mac: ENC[AES256_GCM,data:erU9tlH3kId1cfYyyXmG6Xw7XJmK07Cp8SqfPR6DuycfnwHHENyLLgO4FSGPbGdt+DRcUjL7VD5ZKrvRLLCKuWM9KW3NM+HEs8aBGuIlVicUlS+/L1HkCO8y1+BwawnUqrC+NUnYLIJpjAbk6e5aoSCw+iE0q2LwIOdkfFxlWnw=,iv:ZkNmrLkhDPuV4FxDZi/xESGl4356ZD16NfqjwQxoefI=,tag:AYLtRDV159O93/YHrRI4EA==,type:str]
+ lastmodified: "2025-04-12T18:05:41Z"
+ mac: ENC[AES256_GCM,data:feVDhoy61ivzPJsXjtEd6Dscgq5LXEo7QV6/k6B+kG8T09hz7IZEbkgnQrTtgKtOli4K6FdsGQZMmrc1TPigkVUWZu7+OPeH3Yjgy5ATdB0HNfe6kC/JeGzmBcrCp+ab166ek0s6GMxplx+1R1XUYfmAUYtyPmrF9BWtboBfgow=,iv:Uk1CodL/iXhRc8IshBZKkIUyMI/CIC9+1dJY3XSLRLw=,tag:tH4wBSoTcUKF/ck8z0w/pA==,type:str]
pgp: []
encrypted_regex: ^(root_password|pgdb_password|pgdb_remote_url|hmac_secret_key|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
diff --git a/apps/base/matrix/draupnir-synapse/release.yaml b/apps/base/matrix/draupnir-synapse/release.yaml
@@ -111,7 +111,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
@@ -325,7 +325,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:
@@ -398,13 +398,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/heisenbridge/deployment.yaml b/apps/base/matrix/heisenbridge/deployment.yaml
@@ -25,66 +25,57 @@ spec:
podAntiAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
- labelSelector:
- matchExpressions:
- - key: app
- operator: In
- values:
- - heisenbridge
+ matchExpressions:
+ - key: app
+ operator: In
+ values:
+ - heisenbridge
topologyKey: "kubernetes.io/hostname"
containers:
- name: heisenbridge
image: hif1/heisenbridge:1.15.3
imagePullPolicy: IfNotPresent
- args:
- [
- "-c",
- "/data/heisenbridge.yaml",
- "--listen-address",
- "0.0.0.0",
- "-v",
- "--owner",
- "@mtrnord:midnightthoughts.space",
- "https://matrix.midnightthoughts.space",
- ]
+ args: ["-c", "/data/heisenbridge.yaml", "--listen-address", "0.0.0.0", "-v", "--owner", "@mtrnord:midnightthoughts.space",
+ "https://matrix.midnightthoughts.space"]
resources:
- limits: {}
- requests:
- memory: "344Mi"
- cpu: "252m"
+ limits: {}
+ requests:
+ memory: "344Mi"
+ cpu: "252m"
securityContext:
- runAsUser: 1000
- runAsGroup: 1000
- readOnlyRootFilesystem: true
+ runAsUser: 1000
+ runAsGroup: 1000
+ readOnlyRootFilesystem: true
ports:
- - containerPort: 9898
- name: appservice
- protocol: TCP
+ - containerPort: 9898
+ name: appservice
+ protocol: TCP
volumeMounts:
- - name: config
- mountPath: "/data/heisenbridge.yaml"
- subPath: heisenbridge.yaml
- readOnly: true
- - mountPath: /tmp
- name: tmp
+ - name: config
+ mountPath: "/data/heisenbridge.yaml"
+ subPath: heisenbridge.yaml
+ readOnly: true
+ - mountPath: /tmp
+ name: tmp
livenessProbe:
- httpGet:
- path: /_matrix/mau/live
- port: appservice
- scheme: HTTP
+ httpGet:
+ path: /_matrix/mau/live
+ port: appservice
+ scheme: HTTP
readinessProbe:
- httpGet:
- path: /_matrix/mau/live
- port: appservice
- scheme: HTTP
+ httpGet:
+ path: /_matrix/mau/live
+ port: appservice
+ scheme: HTTP
startupProbe:
- httpGet:
- path: /_matrix/mau/live
- port: appservice
- scheme: HTTP
+ httpGet:
+ path: /_matrix/mau/live
+ port: appservice
+ scheme: HTTP
volumes:
- name: config
secret:
- secretName: heisenbridge
+ secretName: heisenbridge
- name: tmp
emptyDir:
- sizeLimit: 2048Mi
+ sizeLimit: 2048Mi
diff --git a/apps/base/matrix/synapse/release.yaml b/apps/base/matrix/synapse/release.yaml
@@ -102,13 +102,13 @@ spec:
modules:
- module: matrix_invitee_server_blocker.InviteeServerBlocker
config:
- broken_servers:
- #- matrix.org
- - matrix.im
- - funami.tech
- - suicideserver.net
- - cuteness-overdose.com
- - xmr.se
+ broken_servers:
+ #- matrix.org
+ - matrix.im
+ - funami.tech
+ - suicideserver.net
+ - cuteness-overdose.com
+ - xmr.se
persistence:
enabled: true
size: 20Gi
@@ -146,7 +146,7 @@ spec:
emptyDir: {}
- name: configs
secret:
- secretName: ENC[AES256_GCM,data:2QSYYvHXW7uB923R,iv:cptJJgIQAASjlRc7O9eSzaqyXGAuCHW+lmAVzZG21tE=,tag:cBhL/Z14rgUMp0HAHmNtsQ==,type:str]
+ secretName: ENC[AES256_GCM,data:2QSYYvHXW7uB923R,iv:cptJJgIQAASjlRc7O9eSzaqyXGAuCHW+lmAVzZG21tE=,tag:cBhL/Z14rgUMp0HAHmNtsQ==,type:str]
volumeMounts:
- name: matrix-org-blocker
mountPath: /usr/local/lib/python3.11/site-packages/matrix_invitee_server_blocker
@@ -178,11 +178,11 @@ spec:
modules:
- module: matrix_invitee_server_blocker.InviteeServerBlocker
config:
- broken_servers:
- #- matrix.org
- - matrix.im
- - funami.tech
- - suicideserver.net
+ broken_servers:
+ #- matrix.org
+ - matrix.im
+ - funami.tech
+ - suicideserver.net
federation_reader:
resources:
requests:
@@ -364,7 +364,7 @@ spec:
emptyDir: {}
- name: configs
secret:
- secretName: ENC[AES256_GCM,data:8/VDnB+X6KWulTcd,iv:tSkZJtHVZj505D+f9/+BY0cM1Q0369Es49ACxOn2ce0=,tag:fXwKeUwxnVUOXxF6vpjRcg==,type:str]
+ secretName: ENC[AES256_GCM,data:8/VDnB+X6KWulTcd,iv:tSkZJtHVZj505D+f9/+BY0cM1Q0369Es49ACxOn2ce0=,tag:fXwKeUwxnVUOXxF6vpjRcg==,type:str]
extraVolumeMounts:
- name: matrix-org-blocker
mountPath: /usr/local/lib/python3.11/site-packages/matrix_invitee_server_blocker
@@ -414,16 +414,16 @@ spec:
- matrix.midnightthoughts.space
csPaths:
- backendRefs:
- - kind: Service
- name: mas
- port: 8080
+ - kind: Service
+ name: mas
+ port: 8080
matches:
- - path:
- type: RegularExpression
- value: /_matrix/client/.*/(login|logout|refresh).*
- - path:
- type: RegularExpression
- value: /_matrix/client/(api/v1|r0|v3|unstable)/login/sso/redirect
+ - path:
+ type: RegularExpression
+ value: /_matrix/client/.*/(login|logout|refresh).*
+ - path:
+ type: RegularExpression
+ value: /_matrix/client/(api/v1|r0|v3|unstable)/login/sso/redirect
ingress:
enabled: false
sops:
@@ -434,13 +434,13 @@ sops:
age:
- recipient: age1esjyg2qfy49awv0ptkzvpk425adczjr38m37w2mmcahzc4p8n54sll2nzh
enc: |
- -----BEGIN AGE ENCRYPTED FILE-----
- YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5aW9udGhOT3hJbzZGVTR4
- bENnaHRRZ0c5OVYwTElzbDQ2WTJtaGZvaUFBCndWM1l3ekY2RkJWeHNkNXByL2NY
- ZTFwZkZicWNkNmF3T2pPVy9UcVl4QmMKLS0tIHdWd0xnK1YrUFNYSU9pODUvdGFQ
- K1crb3VHMWI4aHhrWnZpNURrOEtIWmMKjTTeR3ji95bdKAq+tYay0K13tCl2gk/0
- 2yzNLjRS/Gaq+kv42aTziLMggquysFaYI6zTulhHEUoaL8SVTl+dOg==
- -----END AGE ENCRYPTED FILE-----
+ -----BEGIN AGE ENCRYPTED FILE-----
+ YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5aW9udGhOT3hJbzZGVTR4
+ bENnaHRRZ0c5OVYwTElzbDQ2WTJtaGZvaUFBCndWM1l3ekY2RkJWeHNkNXByL2NY
+ ZTFwZkZicWNkNmF3T2pPVy9UcVl4QmMKLS0tIHdWd0xnK1YrUFNYSU9pODUvdGFQ
+ K1crb3VHMWI4aHhrWnZpNURrOEtIWmMKjTTeR3ji95bdKAq+tYay0K13tCl2gk/0
+ 2yzNLjRS/Gaq+kv42aTziLMggquysFaYI6zTulhHEUoaL8SVTl+dOg==
+ -----END AGE ENCRYPTED FILE-----
lastmodified: "2025-04-12T16:00:10Z"
mac: ENC[AES256_GCM,data:H2ZGm47kIpb063op6ImlglVcPzhTxZNHOqXp4HHhgxrHbDvDTL867AC36Q02p3+pfdervAFVAHzKgPSWsTEppSxGlePAVULOFhU7NsqdD9e/RJ7LOC2MsNGSKWvleEqkTIDG6kKYnXZ1Ww9p89vqi1IAxMflKQu0fIHHYUj8JSc=,iv:IufnoMRNu89h8EfGNDTlA4yQHRW51/ArIaqeR2Abqzk=,tag:hOA+wJjaa5Bfb/QDX6KRFw==,type:str]
pgp: []
