docker-compose.yaml

@@ -17,9 +17,15 @@ services:
       matrix_db:
     ports:
       - 8008:8008
+    healthcheck:
+      test: ["CMD", "curl", "-fSs", "http://localhost:8008/health"]
+      interval: 15s
+      timeout: 5s
+      retries: 3
+      start_period: 5s
 
   db:
-    image: docker.io/postgres:16.2-alpine
+    image: docker.io/postgres:16-alpine
     environment:
       - POSTGRES_DB=synapse
       - POSTGRES_USER=matrix_synapse
@@ -39,7 +45,8 @@ services:
       matrix_server:
         ipv4_address: 10.10.10.3
     depends_on:
-      - synapse
+      synapse:
+        condition: service_healthy
 
   sydent:
     image: docker.io/matrixdotorg/sydent:v2.6.1
@@ -48,7 +55,8 @@ services:
       matrix_server:
         ipv4_address: 10.10.10.5
     depends_on:
-      - synapse
+      synapse:
+        condition: service_healthy
 
   synapse-admin:
     image: awesometechnologies/synapse-admin:0.10.3
@@ -57,25 +65,11 @@ services:
       matrix_server:
         ipv4_address: 10.10.10.6
     depends_on:
-      - synapse
-
-  sliding-sync:
-    image: ghcr.io/matrix-org/sliding-sync:v0.99.19
-    restart: always
-    environment:
-      - SYNCV3_BINDADDR=:8008
-      - SYNCV3_SERVER=https://DOMAIN
-      - SYNCV3_SECRET=SLIDING_SYNC_KEY
-      - SYNCV3_DB=user=matrix_synapse dbname=synapse sslmode=disable host=db password=PG_PASS
-    networks:
-      matrix_server:
-        ipv4_address: 10.10.10.7
-      matrix_db:
-    depends_on:
-      - synapse
+      synapse:
+        condition: service_healthy
 
   hydrogen-web:
-    image: ghcr.io/element-hq/hydrogen-web:v0.4.1
+    image: ghcr.io/element-hq/hydrogen-web:v0.5.1
     restart: unless-stopped
     environment:
       - |

install.sh

@@ -94,9 +94,10 @@ PG_PASS=$(pwgen -s 28 -1)
 sed -i "s|DOMAIN|${DOMAIN}|g" "${BASE_DIR}/docker-compose.yaml"
 sed -i "s|PG_PASS|${PG_PASS}|g" "${BASE_DIR}/docker-compose.yaml"
 
+# Generate synapse file
 # Generate synapse file
 echo -e "Generating synapse file..\n"
-docker compose run --rm synapse_homeserver --generate-config -H ${DOMAIN} -c /data/homeserver.yaml --report-stats=yes
+docker compose run --rm -e SYNAPSE_SERVER_NAME=${DOMAIN} -e SYNAPSE_REPORT_STATS=yes synapse generate
 
 # Replace DB config in Synapse's homeserver.yaml
 echo -e "Configuring homeserver.yaml\n"
@@ -111,6 +112,7 @@ cp /tmp/homeserver.yaml "${BASE_DIR}/config/synapse/homeserver.yaml"
 
 # Configure User Directory and TURN
 cat <<EOF >> "${BASE_DIR}/config/synapse/homeserver.yaml"
+public_baseurl: "https://${DOMAIN}"
 user_directory:
     enabled: true
     search_all_users: true
@@ -121,6 +123,7 @@ turn_user_lifetime: 86400000
 turn_shared_secret: "${TURN_STATIC_SECRET}"
 turn_uris: [ "turn:${DOMAIN}?transport=udp" ]
 suppress_key_server_warning: true
+enable_authenticated_media: False
 retention:
   enabled: true
   default_policy:
@@ -162,12 +165,6 @@ server {
     add_header X-Content-Type-Options nosniff;
     add_header X-Frame-Options "SAMEORIGIN";
 
-    location /.well-known/matrix/client {
-        default_type application/json;
-        add_header Access-Control-Allow-Origin *;
-        return 200 '{"m.homeserver": {"base_url": "https://${DOMAIN}"}, "org.matrix.msc3575.proxy": {"url": "https://${DOMAIN}"}}';
-    }
-
     # Admin panel
     location /admin/ {
         proxy_pass http://10.10.10.6/;
@@ -186,14 +183,6 @@ server {
         proxy_http_version 1.1;
     }
 
-    # Sliding Sync
-    location ~ ^/(client/|_matrix/client/unstable/org.matrix.msc3575/sync) {
-        proxy_pass http://10.10.10.7:8008;
-        proxy_set_header X-Forwarded-For \$remote_addr;
-        proxy_set_header X-Forwarded-Proto \$scheme;
-        proxy_set_header Host \$host;
-    }
-
     # Synapse Backend
     location ~ ^(\/_matrix|\/_synapse\/(client|admin)) {
         # Synapse Container Network IP
@@ -216,6 +205,12 @@ server {
         proxy_http_version 1.1;
     }
 
+    location /.well-known/matrix/client {
+        default_type application/json;
+        add_header Access-Control-Allow-Origin *;
+        return 200 '{"m.homeserver": {"base_url": "https://${DOMAIN}"}, "m.identity_server": {"base_url": "https://${DOMAIN}"}}';
+    }
+
     # Element Frontend
     location / {
         # Element chat Container Network IP