Standardize config.

matrix/configmap.yaml

@@ -8,7 +8,7 @@ data:
     public_baseurl: https://{{ .domain }}
 
     listeners:
-      - port: {{ .port }}
+      - port: 8008
         tls: false
         type: http
         x_forwarded: true
@@ -20,17 +20,17 @@ data:
     database:
       name: psycopg2
       args:
-        user: {{ .dbUsername }}
+        user: {{ .db.user }}
         password: ${DB_PASSWORD}
-        database: {{ .dbName }}
-        host: {{ .dbHostname }}
+        database: {{ .db.name }}
+        host: {{ .db.host }}
         port: 5432
         cp_min: 5
         cp_max: 10
 
     redis:
       enabled: true
-      host: {{ .redisHostname }}
+      host: {{ .redis.host }}
       port: 6379
       password: ${REDIS_PASSWORD}
 

matrix/db-init-job.yaml

@@ -33,11 +33,11 @@ spec:
                   name: matrix-secrets
                   key: postgres.password
             - name: DB_HOSTNAME
-              value: "{{ .dbHostname }}"
+              value: "{{ .db.host }}"
             - name: DB_DATABASE_NAME
-              value: "{{ .dbName }}"
+              value: "{{ .db.name }}"
             - name: DB_USERNAME
-              value: "{{ .dbUsername }}"
+              value: "{{ .db.user }}"
             - name: DB_PASSWORD
               valueFrom:
                 secretKeyRef:

matrix/deployment.yaml

@@ -18,7 +18,7 @@ spec:
     spec:
       initContainers:
         - name: generate-signing-key
-          image: "{{ .image }}"
+          image: "matrixdotorg/synapse:v1.144.0"
           command: ["/bin/sh", "-c"]
           args:
             - |
@@ -80,7 +80,7 @@ spec:
             readOnlyRootFilesystem: false
       containers:
         - name: synapse
-          image: "{{ .image }}"
+          image: "matrixdotorg/synapse:v1.144.0"
           command: ["/bin/sh", "-c"]
           args:
             - |
@@ -127,17 +127,17 @@ spec:
               # Start Synapse with the processed config
               exec /start.py
           ports:
-            - containerPort: {{ .port }}
+            - containerPort: 8008
               protocol: TCP
               name: http
-            - containerPort: {{ .federationPort }}
+            - containerPort: 8448
               protocol: TCP
               name: federation
           env:
             - name: SYNAPSE_CONFIG_PATH
               value: /data/homeserver.yaml
             - name: TZ
-              value: "{{ .timezone }}"
+              value: "UTC"
             - name: DB_PASSWORD
               valueFrom:
                 secretKeyRef:
@@ -179,14 +179,14 @@ spec:
           livenessProbe:
             httpGet:
               path: /health
-              port: {{ .port }}
+              port: 8008
             initialDelaySeconds: 60
             periodSeconds: 30
             timeoutSeconds: 5
           readinessProbe:
             httpGet:
               path: /health
-              port: {{ .port }}
+              port: 8008
             initialDelaySeconds: 30
             periodSeconds: 10
             timeoutSeconds: 5

matrix/ingress.yaml

@@ -23,7 +23,7 @@ spec:
               service:
                 name: matrix-synapse
                 port:
-                  number: {{ .port }}
+                  number: 8008
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
@@ -49,4 +49,4 @@ spec:
               service:
                 name: matrix-synapse
                 port:
-                  number: {{ .federationPort }}
+                  number: 8448

matrix/manifest.yaml

@@ -1,7 +1,7 @@
 name: matrix
 is: matrix
 description: Matrix is an open standard for secure, decentralized, real-time communication. This deploys the Synapse homeserver for self-hosted Matrix federation and messaging.
-version: v1.144.0
+version: v1.144.0-2
 icon: https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/matrix.svg
 requires:
 - name: postgres
@@ -10,20 +10,18 @@ requires:
 defaultConfig:
   namespace: matrix
   externalDnsDomain: '{{ .cloud.domain }}'
-  image: matrixdotorg/synapse:v1.144.0
-  timezone: UTC
-  port: 8008
-  federationPort: 8448
   storage: 50Gi
   mediaStorage: 100Gi
   serverName: '{{ .cloud.domain }}'
-  dbHostname: postgres.postgres.svc.cluster.local
-  dbUsername: matrix
-  dbName: matrix
-  redisHostname: redis.redis.svc.cluster.local
   domain: matrix.{{ .cloud.domain }}
   tlsSecretName: wildcard-wild-cloud-tls
   enableRegistration: false
+  db:
+    host: '{{ .apps.postgres.host }}'
+    name: matrix
+    user: matrix
+  redis:
+    host: '{{ .apps.redis.host }}'
   smtp:
     host: '{{ .apps.smtp.host }}'
     port: '{{ .apps.smtp.port }}'

matrix/service.yaml

@@ -7,12 +7,12 @@ spec:
   type: ClusterIP
   ports:
     - name: http
-      port: {{ .port }}
-      targetPort: {{ .port }}
+      port: 8008
+      targetPort: 8008
       protocol: TCP
     - name: federation
-      port: {{ .federationPort }}
-      targetPort: {{ .federationPort }}
+      port: 8448
+      targetPort: 8448
       protocol: TCP
   selector:
     app: matrix-synapse