traefik.env

.gitignore

@@ -2,7 +2,6 @@ docker-compose.yml
 data/openvpn
 data/secrets
 data/certbot
-data/traefik
 data/searx
 data/jenkins
 data/beef
@@ -11,6 +10,7 @@ data/authelia
 data/mx-puppet-discord
 data/matrix
 data/heimdall
+data/traefik/traefik.yml
 data/pihole/etc-pihole
 data/pxe
 data.tar.gz

services/arch.yml

@@ -7,6 +7,7 @@ services:
       - "5900:5900"
     networks:
       - caddy
+      - ldap
     volumes:
       - arch:/home/marc
     labels:
@@ -22,5 +23,7 @@ volumes:
   arch:
 
 networks:
+  ldap:
+    external: true
   caddy:
     external: true

services/caddy.yml

@@ -11,7 +11,7 @@ services:
     image: marcpartensky/caddy
     ports:
       - "80:80"
-      - "443:443"
+      # - "443:443"
     environment:
       CADDY_INGRESS_NETWORKS: caddy
     volumes:

services/heimdall.yml

@@ -19,6 +19,8 @@ services:
       traefik.http.routers.heimdall.rule: Host(`heimdall.marcpartensky.com`)
       traefik.http.routers.heimdall.entrypoints: websecure
       traefik.http.routers.heimdall.tls: "true"
+      traefik.http.middlewares.test-ldap-auth.plugin.ldapAuth.source: marcpartensky.com
+      traefik.http.middlewares.test-ldap-auth.plugin.ldapAuth.baseDN: dc=marcpartensky,dc=com
       # traefik.http.services.heimdall.loadbalancer.server.port: 80
       # traefik.http.routers.heimdall.middlewares: authelia-basic@docker
 

services/ldap-manager.yml

@@ -31,5 +31,6 @@ services:
 
 networks:
   ldap:
+    external: true
   caddy:
     external: true

services/ldap.yml

@@ -26,3 +26,4 @@ volumes:
 
 networks:
   ldap:
+    external: true

services/sslh.yml

@@ -14,7 +14,7 @@ services:
       HTTPS_HOST: caddy
       HTTPS_PORT: 443
     ports:
-      # - "443:8443"
+      - "443:8443"
     # command: --tls=caddy:443 --ssh=marcpartensky.com:7022
     networks:
       - caddy

services/traefik.yml

@@ -3,6 +3,8 @@ version: "3.9"
 services:
   traefik:
     image: traefik
+    env_file:
+      - ../data/secrets/traefik.env
     restart: unless-stopped
     command:
       ## Provider Settings - https://docs.traefik.io/providers/docker/#provider-configuration ##
@@ -30,21 +32,27 @@ services:
     networks:
       - caddy
     volumes:
-      - ../data/traefik/letsencrypt:/letsencrypt
+      - traefik_letsencrypt:/letsencrypt
+      # - ../data/traefik/traefik.yml:/root/.config/traefik.yml # no configuration file
       # - ./data/traefik/dynamic.yaml:/dynamic.yaml
       - /var/run/docker.sock:/var/run/docker.sock:ro
     labels:
-      traefik.enable: true
+      traefik.enable: "true"
       traefik.http.routers.traefik.rule: Host(`traefik.marcpartensky.com`)
       traefik.http.routers.traefik.service: api@internal
       traefik.http.routers.traefik.entrypoints: websecure
       traefik.http.routers.traefik.tls.certresolver: tls
       traefik.docker.network: caddy
+      traefik.http.middlewares.test-ldap-auth.plugin.ldapAuth.source: marcpartensky.com
+      traefik.http.middlewares.test-ldap-auth.plugin.ldapAuth.baseDN: dc=marcpartensky,dc=com
       # traefik.http.routers.redirs.entrypoints: web
       # traefik.http.middlewares.redirect-to-https.redirectscheme.scheme: https
       # traefik.http.routers.redirs.middlewares: redirect-to-https
       # traefik.http.routers.redirs.rule: hostregexp(`{host:.+}`)
 
+volumes:
+  traefik_letsencrypt:
+
 networks:
   caddy:
     external: true

services/valentin.yml

@@ -6,17 +6,11 @@ services:
     restart: unless-stopped
     environment:
       PRODUCTION: "True"
-    env_file:
-      - ../data/secrets/valentin.env
     build:
       context: ./
       dockerfile: Dockerfile
     networks:
       - caddy
-    entrypoint: sh -c "
-        ./manage.py migrate &&
-        /app/entrypoint.sh
-      "
     labels:
       caddy: valentin-colin.fr
       caddy.reverse_proxy: "{{upstreams 80}}"