From 5b9facf60395f2e52aad0e2cee8b7164b38fa93a Mon Sep 17 00:00:00 2001
From: Bryan Joshua Pedini <b.pedini@bjphoster.com>
Date: Sat, 15 Jan 2022 22:39:35 +0100
Subject: [PATCH] renamed directories and environment variables

---
 docker-compose.yml | 28 ++++++++++++++--------------
 env.example        |  2 +-
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 32e4269..3904776 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -28,8 +28,8 @@ services:
       # and we want to manually specify exposed containers
       - --providers.docker.exposedbydefault=false
       - --providers.docker.watch=true
-      # should not need, but just in case, a dynamic config file is also configured
-      - --providers.file.directory=/dynamic-config
+      # should not need, but just in case, a folder for dynamic config files is also configured
+      - --providers.file.directory=/config
       - --providers.file.watch=true
     environment:
       - HETZNER_API_KEY=${HETZNER_API_KEY}
@@ -42,23 +42,23 @@ services:
       - traefik.http.middlewares.http-to-https.redirectscheme.scheme=https
       - traefik.http.middlewares.http-to-https.redirectscheme.permanent=true
       ### Section HTTP
-      - traefik.http.routers.http-${TRAEFIK_ROUTER_NAME}.entrypoints=http
+      - traefik.http.routers.http-${TRAEFIK_ROUTER}.entrypoints=http
       # only some people can access the dashboard, hence protect it with it's whitelist
-      - traefik.http.routers.http-${TRAEFIK_ROUTER_NAME}.middlewares=dashboard-whitelist
+      - traefik.http.routers.http-${TRAEFIK_ROUTER}.middlewares=dashboard-whitelist
       # redirect Træfik dashboard to HTTPS only
-      - traefik.http.routers.http-${TRAEFIK_ROUTER_NAME}.middlewares=http-to-https
-      - traefik.http.routers.http-${TRAEFIK_ROUTER_NAME}.rule=Host(`${TRAEFIK_MATCHRULE}`)
-      - traefik.http.routers.http-${TRAEFIK_ROUTER_NAME}.service=api@internal
+      - traefik.http.routers.http-${TRAEFIK_ROUTER}.middlewares=http-to-https
+      - traefik.http.routers.http-${TRAEFIK_ROUTER}.rule=Host(`${TRAEFIK_MATCHRULE}`)
+      - traefik.http.routers.http-${TRAEFIK_ROUTER}.service=api@internal
       ### Section HTTPS
-      - traefik.http.routers.https-${TRAEFIK_ROUTER_NAME}.entrypoints=https
+      - traefik.http.routers.https-${TRAEFIK_ROUTER}.entrypoints=https
       # only some people can access the dashboard, hence protect it with it's whitelist
-      - traefik.http.routers.https-${TRAEFIK_ROUTER_NAME}.middlewares=dashboard-whitelist
+      - traefik.http.routers.https-${TRAEFIK_ROUTER}.middlewares=dashboard-whitelist
       # configure Træfik dashboard to be the exposed service
-      - traefik.http.routers.https-${TRAEFIK_ROUTER_NAME}.rule=Host(`${TRAEFIK_MATCHRULE}`)
-      - traefik.http.routers.https-${TRAEFIK_ROUTER_NAME}.service=api@internal
+      - traefik.http.routers.https-${TRAEFIK_ROUTER}.rule=Host(`${TRAEFIK_MATCHRULE}`)
+      - traefik.http.routers.https-${TRAEFIK_ROUTER}.service=api@internal
       # of course, enable TLS and it's certificate provider
-      - traefik.http.routers.https-${TRAEFIK_ROUTER_NAME}.tls=true
-      - traefik.http.routers.https-${TRAEFIK_ROUTER_NAME}.tls.certresolver=letsencrypt
+      - traefik.http.routers.https-${TRAEFIK_ROUTER}.tls=true
+      - traefik.http.routers.https-${TRAEFIK_ROUTER}.tls.certresolver=letsencrypt
     networks:
       - traefik-proxy
     ports:
@@ -66,7 +66,7 @@ services:
       - 443:443
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock:ro
-      - ./config:/dynamic-config:ro
+      - ./config:/config:ro
       - ./le-certs.json:/le-certs.json
 
 networks:
diff --git a/env.example b/env.example
index b618a58..ae505e6 100644
--- a/env.example
+++ b/env.example
@@ -1,7 +1,7 @@
 TRAEFIK_VERSION=2.4
 TRAEFIK_CONTAINER_NAME=traefik.mydomain.com
 TRAEFIK_MATCHRULE=traefik.mydomain.com
-TRAEFIK_ROUTER_NAME=traefik_mydomain_com
+TRAEFIK_ROUTER=traefik_mydomain_com
 TRAEFIK_LOGLEVEL=INFO
 TRAEFIK_PILOT_TOKEN=
 TRAEFIK_DASHBOARD_WHITELIST=1.2.3.4/24