From b640f953b2b8ff3a9a5e2c78e370c11351b672c1 Mon Sep 17 00:00:00 2001
From: ange <ange@yw5n.com>
Date: Thu, 8 Feb 2024 14:26:02 +0100
Subject: [PATCH] fix(matrix): synapse/matrix mixups

---
 matrix/.env                  | 4 ++--
 matrix/compose.yaml          | 4 ++--
 matrix/nginx.conf            | 2 +-
 matrix/synapse/Dockerfile    | 4 ----
 matrix/synapse/entrypoint.sh | 8 --------
 5 files changed, 5 insertions(+), 17 deletions(-)
 delete mode 100644 matrix/synapse/Dockerfile
 delete mode 100755 matrix/synapse/entrypoint.sh

diff --git a/matrix/.env b/matrix/.env
index fcca1b1..257afd2 100644
--- a/matrix/.env
+++ b/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=
diff --git a/matrix/compose.yaml b/matrix/compose.yaml
index 3ece3c8..33d0f6e 100644
--- a/matrix/compose.yaml
+++ b/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
diff --git a/matrix/nginx.conf b/matrix/nginx.conf
index 895d9a3..93e7132 100644
--- a/matrix/nginx.conf
+++ b/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;
diff --git a/matrix/synapse/Dockerfile b/matrix/synapse/Dockerfile
deleted file mode 100644
index 3f64809..0000000
--- a/matrix/synapse/Dockerfile
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM docker.io/matrixdotorg/synapse:v1.100.0
-COPY entrypoint.sh /usr/local/bin/
-ENTRYPOINT ["entrypoint.sh"]
-CMD ["/start.py"]
diff --git a/matrix/synapse/entrypoint.sh b/matrix/synapse/entrypoint.sh
deleted file mode 100755
index 30c89da..0000000
--- a/matrix/synapse/entrypoint.sh
+++ /dev/null
@@ -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 "$@"