test

manifests/bin/deploy.sh

@@ -51,6 +51,7 @@ kcreatecm synapse-config \
     --from-file=homeserver.yaml=<(envsubst "$(env | xargs printf '$%s ')" < homeserver.yaml) \
     --from-file=log.config=<(envsubst "$(env | xargs printf '$%s ')" < log.config)
 
-kapply common/keys.yaml common/app.yaml
+kapply common/keys.yaml common/app.yaml common/delegation.yaml
 
+kubectl rollout restart deployment delegation
 kubectl rollout restart statefulset app

manifests/bin/prod.sh

@@ -4,7 +4,3 @@
 export NB_REPLICAS=1
 
 . ./manifests/bin/deploy.sh
-
-kapply prod/delegation.yaml
-
-kubectl rollout restart deployment delegation

manifests/common/delegation.yaml

@@ -10,9 +10,9 @@ spec:
   tls:
     - secretName: tls-delegation
       hosts:
-        - "$PUBLIC_URL"
+        - "$SERVER_NAME"
   rules:
-    - host: "$PUBLIC_URL"
+    - host: "$SERVER_NAME"
       http:
         paths:
           - path: /.well-known/matrix/server
@@ -53,11 +53,17 @@ data:
     server {
       listen 80;
 
+      location /.well-known/matrix/server {
+        default_type application/json;
+        add_header Access-Control-Allow-Origin *;
+
+        return 200 '{"m.server": "$BASE_URL:443"}'
+      }
       location /.well-known/matrix/client {
         default_type application/json;
         add_header Access-Control-Allow-Origin *;
 
-        return 200 '{"m.homeserver": { "base_url": "https://$BASE_URL" }}';
+        return 200 '{"m.homeserver": {"base_url": "https://$BASE_URL"}}';
       }
     }
 ---