tmp

Author: ildoc

kubernetes/applications/matrix/configmap.yaml

@@ -21,23 +21,23 @@ data:
           - names: [client, federation]
             compress: false
 
-    # Database - usa env vars
+    # Database - valori hardcoded tranne la password
     database:
       name: psycopg2
       args:
-        user: ${POSTGRES_USER}
+        user: synapse
         password: ${POSTGRES_PASSWORD}
-        database: ${POSTGRES_DB}
-        host: ${POSTGRES_HOST}
-        port: ${POSTGRES_PORT}
+        database: synapse
+        host: 192.168.0.30
+        port: 5432
         cp_min: 5
         cp_max: 10
 
-    # Redis - usa env vars con username
+    # Redis - valori hardcoded tranne la password
     redis:
       enabled: true
-      host: ${SYNAPSE_REDIS_HOST}
-      port: ${SYNAPSE_REDIS_PORT}
+      host: matrix-redis.apps.svc.cluster.local
+      port: 6379
       password: ${SYNAPSE_REDIS_PASSWORD}
 
     log_config: "/data/log.config"

kubernetes/applications/matrix/deployment.yaml

@@ -46,14 +46,6 @@ spec:
               value: "matrix.ildoc.it"
             - name: SYNAPSE_REPORT_STATS
               value: "no"
-            - name: POSTGRES_HOST
-              value: "192.168.0.30"
-            - name: POSTGRES_PORT
-              value: "5432"
-            - name: POSTGRES_DB
-              value: "matrix_db"
-            - name: POSTGRES_USER
-              value: "matrix_user"
             - name: POSTGRES_PASSWORD
               valueFrom:
                 secretKeyRef:
@@ -121,16 +113,26 @@ spec:
                 secretKeyRef:
                   name: matrix-cross-secrets
                   key: postgres-password
-            # Redis configuration
-            - name: SYNAPSE_REDIS_HOST
-              value: "matrix-redis.apps.svc.cluster.local"
-            - name: SYNAPSE_REDIS_PORT
-              value: "6379"
             - name: SYNAPSE_REDIS_PASSWORD
               valueFrom:
                 secretKeyRef:
                   name: matrix-redis-secret
                   key: password
+            - name: REGISTRATION_SHARED_SECRET
+              valueFrom:
+                secretKeyRef:
+                  name: matrix-k8s-secrets
+                  key: registration-shared-secret
+            - name: MACAROON_SECRET_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: matrix-k8s-secrets
+                  key: macaroon-secret-key
+            - name: FORM_SECRET
+              valueFrom:
+                secretKeyRef:
+                  name: matrix-k8s-secrets
+                  key: form-secret
           ports:
             - containerPort: 8008
               name: http