matrix server update...almost working...WIP

1 files changed, 37 insertions, 22 deletions

diff --git a/matrix-server/docker-compose.yml b/matrix-server/docker-compose.yml
index 42083c2..eb0f354 100644
--- a/matrix-server/docker-compose.yml
+++ b/matrix-server/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3.8"
+version: "3.4"
 services:
   postgres:
     image: postgres:13-alpine
@@ -28,20 +28,26 @@ services:
       - dbnet
     volumes:
       - synapse-data:/data/
-      - cert-data:/etc/letsencrypt/live/
-      - ./synapse/homeserver.yaml:/data/homeserver.yaml:ro
+      # - cert-data:/etc/letsencrypt/live/
+      # - ./synapse/homeserver.yaml:/data/homeserver.yaml
+      # - ./synapse/terminaldweller.com.signing.key:/data/terminaldweller.com.signing.key
+      # - ./synapse/terminaldweller.com.log.config:/data/terminaldweller.com.log.config
+    # entrypoint: ["tail", "-f", "/dev/null"]
+    # command: ["generate"]
     depends_on:
       - postgres
       - haproxy
     ports:
       - "8008:8008"
-      - "8484:8484/tcp"
-      - "8443:443"
+      # - "8484:8484/tcp"
+      # - "443:443"
     environment:
+      - SYNAPSE_SERVER_NAME=terminaldweller.com
+      - SYNAPSE_REPORT_STATS=yes
       - SYNAPSE_DATA_DIR=/data/
       - SYNAPSE_CONFIG_DIR=/data/
       - SYNAPSE_CONFIG_PATH=/data/homeserver.yaml
-      - TZ=Tehran/Asia
+      # - TZ=Tehran/Asia
     healthcheck:
       test: ["CMD", "curl", "-fSs", "http://localhost:8008/health"]
       interval: 1m
@@ -50,42 +56,49 @@ services:
   haproxy:
     image: haproxy:lts-alpine
     ports:
-      - "9080:80"
+      - "80:80"
       - "443:443"
       - "9999:9999"
+      - "8448:8448/tcp"
     networks:
       - matrixnet
       - turnnet
+      - certnet
     volumes:
       - ./haproxy/haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg:ro
-      - cert-data:/usr/local/etc/haproxy/certificates:ro
+      # - cert-data:/usr/local/etc/haproxy/certificates:ro
+      # - cert-data:/etc/certificates:ro
+      - certificates:/etc/certificates
     depends_on:
       - certbot
-    restart: on-failure
+    # restart: on-failure
   certbot:
     image: certbot
     build:
       context: ./certbot
     ports:
-      - "80:80"
+      - "9080:80"
       - "9443:443"
     networks:
       - certnet
     volumes:
-      - cert-data:/etc/certificates
+      # - cert-data:/etc/certificates
+      - certificates:/etc/certificates
+      - certbot-data:/etc/letsencrypt
     entrypoint: "/bin/sh -c 'trap exit TERM; while :; do . /etc/scripts/renew-certificates.sh ; sleep 12h & wait $${!}; done;'"
     restart: always
-  coturn:
-    image: coturn/coturn:latest
-    networks:
-      - turnnet
-    volumes:
-      - ./coturn/turnserver.conf:/etc/turnserver.conf:ro
-    ports:
-      - "3478:3478"
-      - "5349:5349"
-    depends_on:
-      - synapse
+    command: ["certonly"]
+  # coturn:
+  #   image: coturn/coturn:latest
+  #   networks:
+  #     - turnnet
+  #   volumes:
+  #     - ./coturn/turnserver.conf:/etc/turnserver.conf:ro
+  #   ports:
+  #     - "3478:3478"
+  #     - "5349:5349"
+  #   depends_on:
+  #     - synapse
 networks:
   matrixnet:
   certnet:
@@ -95,6 +108,8 @@ volumes:
   db-data:
   synapse-data:
   cert-data:
+  certificates:
+  certbot-data:
 secrets:
   pg_pass_secret:
     file: ./postgres/pg_pass_secret