From c996f0bde6363f2129de191b581be8d0f1e51121 Mon Sep 17 00:00:00 2001
From: Jafner <40403594+Jafner@users.noreply.github.com>
Date: Sun, 11 Jul 2021 15:56:14 -0700
Subject: [PATCH] Added Authelia SSO for some containers

Added:
- calibre-web-dev
- grafana
- portainer
to Authelia protected sites
---
 docker_config/calibre-web/docker-compose.yml   | 1 +
 docker_config/dragondex/docker-compose.yml     | 1 -
 docker_config/drawio/docker-compose.yml        | 1 -
 docker_config/grafana-stack/docker-compose.yml | 2 +-
 docker_config/portainer/docker-compose.yml     | 1 +
 docker_config/rpg-cards/docker-compose.yml     | 1 -
 docker_config/wikijs/docker-compose.yml        | 1 -
 7 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/docker_config/calibre-web/docker-compose.yml b/docker_config/calibre-web/docker-compose.yml
index 1f40eebd..a5828bfe 100644
--- a/docker_config/calibre-web/docker-compose.yml
+++ b/docker_config/calibre-web/docker-compose.yml
@@ -14,6 +14,7 @@ services:
       - traefik.http.routers.calibre-dev.rule=Host(`calibre-dev.jafner.net`)
       - traefik.http.routers.calibre-dev.tls=true
       - traefik.http.routers.calibre-dev.tls.certresolver=lets-encrypt
+      - traefik.http.routers.calibre-dev.middlewares=authelia@file
     networks:
       - web
   calibre-web-prod:
diff --git a/docker_config/dragondex/docker-compose.yml b/docker_config/dragondex/docker-compose.yml
index 8134390d..feb22d6d 100644
--- a/docker_config/dragondex/docker-compose.yml
+++ b/docker_config/dragondex/docker-compose.yml
@@ -9,7 +9,6 @@ services:
       - "${DOCKER_DATA}/DragonDex:/usr/local/apache2/htdocs"
     labels:
       - traefik.http.routers.dragondex.rule=Host(`dragondex.jafner.net`)
-      - traefik.http.routers.dragondex.tls=true
       - traefik.http.routers.dragondex.tls.certresolver=lets-encrypt
 networks:
   web:
diff --git a/docker_config/drawio/docker-compose.yml b/docker_config/drawio/docker-compose.yml
index b1f38d95..e859c3d9 100644
--- a/docker_config/drawio/docker-compose.yml
+++ b/docker_config/drawio/docker-compose.yml
@@ -61,7 +61,6 @@ services:
       - DRAWIO_MXPUSHER_ENDPOINT=${DRAWIO_MXPUSHER_ENDPOINT}
     labels:
       - traefik.http.routers.drawio.rule=Host(`draw.jafner.net`)
-      - traefik.http.routers.drawio.tls=true
       - traefik.http.routers.drawio.tls.certresolver=lets-encrypt
 
 networks:
diff --git a/docker_config/grafana-stack/docker-compose.yml b/docker_config/grafana-stack/docker-compose.yml
index 88c2982b..369d1ce3 100644
--- a/docker_config/grafana-stack/docker-compose.yml
+++ b/docker_config/grafana-stack/docker-compose.yml
@@ -46,8 +46,8 @@ services:
       - GF_INSTALL_PLUGINS=grafana-clock-panel,grafana-simple-json-datasource,grafana-worldmap-panel,grafana-piechart-panel
     labels:
       - traefik.http.routers.grafana.rule=Host(`grafana.jafner.net`)
-      - traefik.http.routers.grafana.tls=true
       - traefik.http.routers.grafana.tls.certresolver=lets-encrypt
+      - traefik.http.routers.grafana.middlewares=authelia@file
 
 networks:
   grafana:
diff --git a/docker_config/portainer/docker-compose.yml b/docker_config/portainer/docker-compose.yml
index f39e592d..72165347 100644
--- a/docker_config/portainer/docker-compose.yml
+++ b/docker_config/portainer/docker-compose.yml
@@ -14,6 +14,7 @@ services:
         - traefik.http.routers.portainer.rule=Host(`portainer.jafner.net`)
         - traefik.http.routers.portainer.tls.certresolver=lets-encrypt
         - traefik.http.services.portainer.loadbalancer.server.port=9000
+        - traefik.http.routers.portainer.middlewares=authelia@file
 
 volumes:
   portainer_data:
diff --git a/docker_config/rpg-cards/docker-compose.yml b/docker_config/rpg-cards/docker-compose.yml
index f899e673..54064720 100644
--- a/docker_config/rpg-cards/docker-compose.yml
+++ b/docker_config/rpg-cards/docker-compose.yml
@@ -19,7 +19,6 @@ services:
       - "${DOCKER_DATA}/generator:/usr/local/apache2/htdocs"
     labels:
       - traefik.http.routers.rpg-cards.rule=Host(`rpg-cards.jafner.net`)
-      - traefik.http.routers.rpg-cards.tls=true
       - traefik.http.routers.rpg-cards.tls.certresolver=lets-encrypt
 networks:
   web:
diff --git a/docker_config/wikijs/docker-compose.yml b/docker_config/wikijs/docker-compose.yml
index 6ad93901..4cc72eb1 100644
--- a/docker_config/wikijs/docker-compose.yml
+++ b/docker_config/wikijs/docker-compose.yml
@@ -36,7 +36,6 @@ services:
       - ${PWD}/id_rsa.pub:/id_rsa.pub
     labels:
       - traefik.http.routers.wikijs.rule=Host(`wikijs.jafner.net`)
-      - traefik.http.routers.wikijs.tls=true
       - traefik.http.routers.wikijs.tls.certresolver=lets-encrypt
       - traefik.http.services.wikijs.loadbalancer.server.port=3000