fix(matrix): synapse/matrix mixups

matrix/.env

@@ -3,7 +3,7 @@ EMAIL=
 ###############
 ### Synapse ###
 ###############
-SYNAPSE_BASE_URL=matrix.
+MATRIX_BASE_URL=matrix.
 POSTGRES_PASSWORD=
 
 PUID=1000
@@ -21,4 +21,4 @@ POSTGRES_DB=matrix
 ### Coturn ###
 ##############
 COTURN_BASE_URL=turn.
-AUTH_SECRET=    #$(openssl rand -hex 32)
+AUTH_SECRET=

matrix/compose.yaml

@@ -47,13 +47,13 @@ services:
       - AUTH_SECRET
 
   synapse:
-    build: synapse
+    image: docker.io/matrixdotorg/synapse:v1.100.0
     restart: unless-stopped
     volumes:
       - synapse_config:/config/
       - synapse_data:/data/
     environment:
-      - SYNAPSE_SERVER_NAME=$SYNAPSE_BASE_URL
+      - SYNAPSE_SERVER_NAME=$MATRIX_BASE_URL
       - SYNAPSE_CONFIG_DIR=/config
       - SYNAPSE_DATA_DIR=/data
       - UID=$PUID

matrix/nginx.conf

@@ -17,7 +17,7 @@ server {
     ssl_certificate_key /etc/letsencrypt/live/$BASE_URL/privkey.pem;
 
     location ~ ^(/_matrix|/_synapse/client) {
-        proxy_pass http://matrix:8008;
+        proxy_pass http://synapse:8008;
 
         proxy_set_header     X-Forwarded-For   $remote_addr;
         proxy_set_header     X-Forwarded-Proto $scheme;

matrix/synapse/Dockerfile

@@ -1,4 +0,0 @@
-FROM docker.io/matrixdotorg/synapse:v1.100.0
-COPY entrypoint.sh /usr/local/bin/
-ENTRYPOINT ["entrypoint.sh"]
-CMD ["/start.py"]

matrix/synapse/entrypoint.sh

@@ -1,8 +0,0 @@
-#!/bin/bash -e
-
-sed -i                                            \
-    -e "/turn_uris/s/:*/: [$COTURN_BASE_URL]/"      \
-    -e "/turn_shared_secret/s/:.*/: $AUTH_SECRET" \
-    /config/homeserver
-
-exec "$@"