From da3b5da4dfd65c74454b06b1581778d5865a5f5d Mon Sep 17 00:00:00 2001
From: winzlieb <winzlieb@c3d2.de>
Date: Wed, 23 Sep 2020 03:07:38 +0000
Subject: [PATCH] traefik config,...

---
 docker-compose.yml | 27 +++++++++++++++++++++++----
 etherpad.yml       |  2 ++
 make-dirs.sh       |  1 +
 3 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 make-dirs.sh

diff --git a/docker-compose.yml b/docker-compose.yml
index 6d6d546..ba77100 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,9 +5,9 @@ services:
     web:
         image: jitsi/web:latest
         restart: ${RESTART_POLICY}
-        ports:
-            - '${HTTP_PORT}:80'
-            - '${HTTPS_PORT}:443'
+        #        ports:
+        #            - '${HTTP_PORT}:80'
+        #            - '${HTTPS_PORT}:443'
         volumes:
             - ${CONFIG}/web:/config:Z
             - ${CONFIG}/web/letsencrypt:/etc/letsencrypt:Z
@@ -40,9 +40,19 @@ services:
             - JIBRI_RECORDER_PASSWORD
             - ENABLE_RECORDING
         networks:
+            traefik:
             meet.jitsi:
                 aliases:
                     - ${XMPP_DOMAIN}
+        labels:
+            - "traefik.docker.network=traefik"
+            - "traefik.enable=true"
+            - "traefik.http.services.jitsi.loadbalancer.server.port=80"
+            - "traefik.http.routers.jitsi.rule=Host(`jitsi.live.datenspuren.de`)"
+            - "traefik.http.routers.jitsi.entrypoints=websecure"
+            - "traefik.http.routers.jitsi.tls=true"
+            - "traefik.http.routers.jitsi.tls.certresolver=le"
+            - "traefik.http.routers.jitsi.service=jitsi"
 
     # XMPP server
     prosody:
@@ -106,9 +116,12 @@ services:
             - LOG_LEVEL
             - TZ
         networks:
+            traefik:
             meet.jitsi:
                 aliases:
                     - ${XMPP_SERVER}
+        labels:
+            - "traefik.enable=false"
 
     # Focus component
     jicofo:
@@ -136,8 +149,10 @@ services:
             - TZ
         depends_on:
             - prosody
-        networks:
+        networks:          
             meet.jitsi:
+        labels:
+            - "traefik.enable=false"
 
     # Video bridge
     jvb:
@@ -166,7 +181,11 @@ services:
             - prosody
         networks:
             meet.jitsi:
+        labels:
+            - "traefik.enable=false"
 
 # Custom network so all services can communicate using a FQDN
 networks:
+    traefik:
+        external: true
     meet.jitsi:
diff --git a/etherpad.yml b/etherpad.yml
index daf9c1d..82d6337 100644
--- a/etherpad.yml
+++ b/etherpad.yml
@@ -5,6 +5,8 @@ services:
     etherpad:
         image: jitsi/etherpad:latest
         restart: ${RESTART_POLICY}
+        labels:
+            - "traefik.enable=false"
         networks:
             meet.jitsi:
                 aliases:
diff --git a/make-dirs.sh b/make-dirs.sh
new file mode 100644
index 0000000..56d89bf
--- /dev/null
+++ b/make-dirs.sh
@@ -0,0 +1 @@
+mkdir -p jitsi-meet-cfg/{web/letsencrypt,transcripts,prosody,jicofo,jvb,jigasi,jibri}