services/matrix/docker-compose.yml

@@ -37,8 +37,9 @@ services:
     restart: "${RESTART:-no}"
     environment:
       - POSTGRES_DB=matrix
-      - POSTGRES_USER=${MATRIX_PG_USER:-matrix}
+      - POSTGRES_USER=matrix
       - POSTGRES_PASSWORD=${MATRIX_PG_PWD:-matrix}
+      - POSTGRES_INITDB_ARGS=--encoding=UTF-8 --lc-collate=C --lc-ctype=C
     volumes:
       - ${BASE_DIR:-/srv}/matrix/psql:/var/lib/postgresql/data
     networks:

services/proxy/Caddyfile

@@ -1,7 +1,6 @@
 (logging) {
   log {
     output stdout
-    # format transform "{common_log}"
   }
 }
 
@@ -31,14 +30,23 @@
   }
 }
 
-# https://{$BASE_DOMAIN} {
+https://{$BASE_DOMAIN} {
-#   import logging
+  import logging
-#   import errorpages
+  import errorpages
-#   reverse_proxy /_matrix* matrix:8008
+  @matrix {
+    path /_matrix/* /_synapse/*
+  }
+  reverse_proxy @matrix matrix:8008
 
-#   root * /srv/homepage
+  root * /srv/homepage
-#   file_server
+  file_server
-# }
+}
+
+https://{$BASE_DOMAIN}:8448 {
+  import logging
+  import errorpages
+  reverse_proxy matrix:8008
+}
 
 # needs to be http!
 http://autoconfig.{$BASE_DOMAIN} {
@@ -75,12 +83,6 @@ https://git-next.{$BASE_DOMAIN} {
   reverse_proxy forgejo:3000
 }
 
-# https://{$BASE_DOMAIN}:8448 {
-#   import logging
-#   import errorpages
-#   reverse_proxy matrix:8008
-# }
-
 # https://echo.{$BASE_DOMAIN} {
 #   import logging
 #   import errorpages

tasks/services.yml

@@ -29,7 +29,7 @@ tasks:
   psql-restore:
     desc: Load postgres database for restore
     cmds:
-      - docker exec pg-{{.CLI_ARGS}} psql --echo-errors -U {{.CLI_ARGS}} -d {{.CLI_ARGS}} < {{.TMP_DIR}}/{{.CLI_ARGS}}.sql
+      - docker exec -i pg-{{.CLI_ARGS}} psql --echo-errors -U {{.CLI_ARGS}} -d {{.CLI_ARGS}} < {{.TMP_DIR}}/{{.CLI_ARGS}}.sql
 
   psql-clear-tmp:
     desc: Clear temporary sql files created by psql-dump