From 3212d8ff3b20fb1129d5aecdc0648baa2cdbaa14 Mon Sep 17 00:00:00 2001
From: Marvin Blum <marvin@marvinblum.de>
Date: Sat, 5 Dec 2020 00:11:09 +0100
Subject: [PATCH] Fixed docker-compose.

---
 docker-compose.yml | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 440d812..57a637e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,6 +8,7 @@ services:
     networks:
       - traefik-internal
     command:
+      - "--api.dashboard=true"
       - "--providers.docker=true"
       - "--providers.docker.exposedbydefault=false"
       - "--providers.docker.network=marvinblum_traefik-internal"
@@ -20,11 +21,19 @@ services:
     ports:
       - "80:80"
       - "443:443"
+      - "8080:8080"
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock:ro
       - /root/marvinblum/letsencrypt:/letsencrypt
     labels:
       - "traefik.enable=true"
+      - "traefik.port=9999"
+      - "traefik.http.routers.traefik.entrypoints=websecure"
+      - "traefik.http.routers.traefik.rule=Host(`traefik.marvinblum.de`)"
+      - "traefik.http.routers.traefik.service=api@internal"
+      - "traefik.http.routers.traefik.tls.certresolver=tls-resolver"
+      - "traefik.http.routers.traefik.middlewares=traefik-auth"
+      - "traefik.http.middlewares.traefik-auth.basicauth.users=marvinblum:$$apr1$$u.IJozER$$DoY0zwzgAciDpPs4vZvxY/"
       # Global redirection: http to https
       - 'traefik.http.routers.http-catchall.rule=HostRegexp(`{host:(www\.)?.+}`)'
       - "traefik.http.routers.http-catchall.entrypoints=web"
@@ -45,25 +54,22 @@ services:
     depends_on:
       - traefik
     networks:
-      - postgres_db-internal
       - traefik-internal
     env_file:
       - secrets.env
     environment:
       MB_EMVI_CLIENT_ID: 3fBBn144yvSF9R3dPC8l
       MB_EMVI_ORGA: marvin
-      export MB_PIRSCH_CLIENT_ID: gEb3pvgxZvZzFRlOTdMgPtyLvNYgeVKe
-      export MB_PIRSCH_HOSTNAME: marvinblum.de
+      MB_PIRSCH_CLIENT_ID: mkiAzI2ZGjGBv8fpwh1A09fCJ8G1YFgx
+      MB_PIRSCH_HOSTNAME: marvinblum.de
     labels:
       - "traefik.enable=true"
       - "traefik.port=8888"
-      - "traefik.http.routers.schnittfest.rule=Host(`marvinblum.de`) || Host(`www.marvinblum.de`)"
-      - "traefik.http.routers.schnittfest.entrypoints=websecure"
-      - "traefik.http.routers.schnittfest.tls=true"
-      - "traefik.http.routers.schnittfest.tls.certresolver=tls-resolver"
+      - "traefik.http.routers.marvinblum.rule=Host(`marvinblum.de`) || Host(`www.marvinblum.de`)"
+      - "traefik.http.routers.marvinblum.entrypoints=websecure"
+      - "traefik.http.routers.marvinblum.tls=true"
+      - "traefik.http.routers.marvinblum.tls.certresolver=tls-resolver"
 
 networks:
   traefik-internal:
     driver: bridge
-  postgres_db-internal:
-    external: true