cluster

commit b6cf7ef4a65127f38d8725f23624c34acc88f741
parent 5c0dad72aa1feabac48a611345cc38cb14956f5e
Author: MTRNord <mtrnord1@gmail.com>
Date:   Wed, 25 Sep 2024 18:39:11 +0200

Prepare mas config

Diffstat:
M
apps/2024_cluster/kustomization.yaml
 | 
2
+-
M
apps/base/matrix/mas/mas_deployment.yaml
 | 
14
+++++++++-----

2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/apps/2024_cluster/kustomization.yaml b/apps/2024_cluster/kustomization.yaml
@@ -11,7 +11,7 @@ resources:
   - ../base/matrix/draupnir-synapse
   - ../base/matrix/draupnir4all
   - ../base/matrix/synapse
-  - ../base/matrix/mas
+  #- ../base/matrix/mas
   - ../base/matrix/draupnir-fluffy
   - ../base/matrix/draupnir-freifunk
   - ../base/mastodon
diff --git a/apps/base/matrix/mas/mas_deployment.yaml b/apps/base/matrix/mas/mas_deployment.yaml
@@ -16,13 +16,13 @@ spec:
       containers:
         - name: mas
           # Syn2Mas image
-          image: ghcr.io/mtrnord/cluster/syn2mas:db_fix
+          #image: ghcr.io/mtrnord/cluster/syn2mas:db_fix
           # Normal image
-          #image: ghcr.io/element-hq/matrix-authentication-service:latest
-          imagePullPolicy: Always
-          args: [ "--command=advisor", "--synapseConfigFile=/homeserver.yaml" ]
+          image: ghcr.io/element-hq/matrix-authentication-service:latest
+          #imagePullPolicy: Always
+          #args: [ "--command=advisor", "--synapseConfigFile=/homeserver.yaml" ]
           # Normal mode
-          #args: [ "server" ]
+          args: [ "server" ]
           ports:
             - containerPort: 8080
             - containerPort: 8081
@@ -34,6 +34,10 @@ spec:
             - name: mas-config
               mountPath: /homeserver.yaml
               subPath: merged-synapse-config
+          # Set MAS_CONIG env variable to the path of the config file
+          env:
+            - name: MAS_CONFIG
+              value: /config.yaml
       livenessProbe:
         httpGet:
           path: /health