debug

Reviewed-on: #1

.env

@@ -1,8 +1,8 @@
 PROD_URL=matrix.gmoker.com
 SERVER_NAME=gmoker.com
-IMAGEAPP=ghcr.io/element-hq/synapse:v1.115.0
+IMAGEAPP=ghcr.io/element-hq/synapse:v1.121.1
 
-TURN_URL=turn.test.gmoker.com
+#TURN_URL=turn.test.gmoker.com
-IMAGECOTURN=docker.io/coturn/coturn:4.6.2-r12
+#IMAGECOTURN=docker.io/coturn/coturn:4.6.2-r12
 
 MAX_UPLOAD_SIZE=50M

compose.yaml

@@ -1,12 +1,12 @@
 ---
 services:
   db:
-    image: docker.io/postgres:15
+    image: docker.io/postgres:17
     restart: unless-stopped
     environment:
-      - POSTGRES_DB
+      - POSTGRES_DB=db
-      - POSTGRES_USER
+      - POSTGRES_USER=db
-      - POSTGRES_PASSWORD
+      - POSTGRES_PASSWORD=db
     volumes:
       - db:/var/lib/postgresql/data/
 
@@ -16,6 +16,11 @@ services:
     ports:
       - "8080:8008"
       - "8448:8448"
+    environment:
+      - POSTGRES_HOST=db
+      - POSTGRES_DB=db
+      - POSTGRES_USER=db
+      - POSTGRES_PASSWORD=db
     volumes:
       - synapse_config:/config/
       - synapse_data:/data/

manifests/bin/deploy.sh

@@ -1,37 +1,40 @@
-#!/bin/bash -e
+#!/bin/bash
-set -o pipefail
+set -xeo pipefail
 
 function kapply() {
     for f in "$@"; do
-        kubectl apply -f \
+        kubectl apply -f <(envsubst < "manifests/$f")
-            <(envsubst "$(env | xargs printf '$%s ')" < "manifests/$f")
     done
-}
+}; export -f kapply
 
 function kcreatesec() {
-    kubectl create secret generic --save-config --dry-run=client -oyaml "$@" | kubectl apply -f-
+    kubectl create secret generic --dry-run=client -oyaml "$@" | kubectl replace -f-
-}
+}; export -f kcreatesec
 
 function kcreatecm() {
-    kubectl create configmap --dry-run=client -oyaml "$@" | kubectl apply -f-
+    kubectl create configmap --dry-run=client -oyaml "$@" | kubectl replace -f-
-}
+}; export -f kcreatecm
 
 function kgseckey() {
     local sec="$1"; shift
     local key="$1"; shift
 
-    kubectl get secret "$sec" -o jsonpath="{.data.$key}" | base64 -d
+    if ! kubectl get secret "$sec" -ojson | jq -re ".data.\"$key\" // empty" | base64 -d; then
-}
+        return 1
+    fi
+}; export -f kgseckey
 
 function kgcmkey() {
-    local cm="$1"; shift
+    local cm="$1";  shift
     local key="$1"; shift
 
-    kubectl get configmap "$cm" -o jsonpath="{.data.$key}"
+    if ! kubectl get configmap "$cm" -ojson | jq -re ".data.\"$key\" // empty"; then
-}
+        return 1
+    fi
+}; export -f kgcmkey
 
 function get_synapse_key() {
-    kgcmkey synapse 'homeserver\.yaml' | awk -F\" "/^\s*$1/{print \$2}" || openssl rand -hex 32
+    kgcmkey synapse homeserver.yaml | awk -F\" "/^\s*$1/{print \$2}" || openssl rand -hex 32
 }
 
 
@@ -48,8 +51,8 @@ export TURN_SHARED_SECRET;   TURN_SHARED_SECRET="$(get_synapse_key turn_shared_s
 export REGISTRATION_SECRET; REGISTRATION_SECRET="$(get_synapse_key registration_shared_secret)"
 
 kcreatecm synapse \
-    --from-file=homeserver.yaml=<(envsubst "$(env | xargs printf '$%s ')" < config/homeserver.yaml) \
+    --from-file=homeserver.yaml=<(envsubst < config/homeserver.yaml) \
-    --from-file=log.config=<(envsubst "$(env | xargs printf '$%s ')" < config/log.config)
+    --from-file=log.config=<(envsubst < config/log.config)
 
 kapply common/keys.yaml common/app.yaml
 

manifests/bin/devel.sh

@@ -1,4 +1,5 @@
-#!/bin/bash -e
+#!/bin/bash
+set -eo pipefail
 
 export NB_REPLICAS=1
 

manifests/bin/prod.sh

@@ -1,4 +1,5 @@
-#!/bin/bash -e
+#!/bin/bash
+set -eo pipefail
 
 # TODO: 3
 export NB_REPLICAS=1