From af6293c990fa49c8a271d81679647d79926bf74a Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@nico-notebook.schottelius.org>
Date: Fri, 29 Sep 2023 13:06:17 +0200
Subject: [PATCH] Begin cleanup of elementweb deployment

---
 .../files/elementweb/docker-compose.yaml      | 42 +++++--------------
 1 file changed, 11 insertions(+), 31 deletions(-)

diff --git a/ansible/roles/docker-compose/files/elementweb/docker-compose.yaml b/ansible/roles/docker-compose/files/elementweb/docker-compose.yaml
index ef4329f..99580f5 100644
--- a/ansible/roles/docker-compose/files/elementweb/docker-compose.yaml
+++ b/ansible/roles/docker-compose/files/elementweb/docker-compose.yaml
@@ -1,44 +1,24 @@
 version: '3'
 services:
-  synapse:
-    image: matrixdotorg/synapse:latest
-    restart: unless-stopped
-    environment:
-      - SYNAPSE_CONFIG_PATH=/data/homeserver.yaml
-      - SERVERNAME=${homeServerFQDN}
-      - PUBLICBASEURL=${synapseFQDN}
-      - ELEMENTWEB=${elementWebFQDN}
-    ports:
-      - "8008:8008/tcp"
-    volumes:
-      - ./synapse:/data
-    entrypoint: sh -c "/data/homeserver.yaml.sh && chmod -R 777 /data  && /start.py"
-    depends_on:
-      - postgres
-
-  element:
+  elementweb:
     image: vectorim/element-web:latest
     restart: unless-stopped
     environment:
       - SERVERNAME=${homeServerFQDN}
       - PUBLICBASEURL=${synapseFQDN}
       - ELEMENTWEB=${elementWebFQDN}
-    volumes:
-      - ./element/config.json.sh:/app/config.json.sh
-    command: sh -c "/app/config.json.sh && nginx -g 'daemon off;'"
-    #entrypoint: /app/config.json.sh
+    #volumes:
+    #  - ./element/config.json.sh:/app/config.json.sh
+    #command: sh -c "/app/config.json.sh && nginx -g 'daemon off;'"
+    entrypoint: /app/config.json.sh
     ports:
       - "80:80/tcp"
 
-  postgres:
-    image: postgres:14
-    restart: unless-stopped
+  nginx:
+    image: nginx:${NGINX_VERSION}
     ports:
-      - "5432:5432/tcp"
+      - "80:80/tcp"
+      - "443:443/tcp"
     volumes:
-     - ./postgresdata:/var/lib/postgresql/data
-    environment:
-     - POSTGRES_DB=synapse
-     - POSTGRES_USER=synapse
-     - POSTGRES_PASSWORD=NEEDTOSETPASSWORD
-     - POSTGRES_INITDB_ARGS=--encoding=UTF-8 --lc-collate=C --lc-ctype=C
+      - ./nginx:/etc/nginx/conf.d
+      - /ssl:/ssl