update

Traefik/configs/traefik.yml

@@ -8,35 +8,29 @@ global:
 entryPoints:
   http:
     address: ":80"
+#    forwardedHeaders:
+#      insecure: true
     http:
       redirections:
         entryPoint:
-          to: "https"
-          scheme: "https"
+          to: https
+          scheme: https
   https:
     address: ":443"
+#    forwardedHeaders:
+#      insecure: true
+#    http:
+#      middlewares:
+#        - secureHeaders@file
+#      tls:
+#        certResolver: letsencrypt
   metrics:
     address: ":8181"
 
-# Access logs
-# accessLog: fields:
-#   headers:
-#     names:
-#       User-Agent: keep
-
 providers:
   docker:
     endpoint: "unix:///var/run/docker.sock"
     exposedByDefault: false
-<<<<<<< HEAD
-<<<<<<< HEAD
-#    network: "interne"
-=======
-    network: "interne"
->>>>>>> 8e9a2c2beb8c28880271da161158adf0cb6617e0
-=======
-#    network: "interne"
->>>>>>> 788e10b187487aabd04ab6b559995c1fa0994cb3
     watch: true
   file:
     directory: /etc/traefik/dynamic
@@ -44,16 +38,21 @@ providers:
   providersThrottleDuration: 10
 
 certificatesResolvers:
-  letsencrypt:
+  cloudflare:
     acme:
+      email: admin@tips-of-mine.fr
+      storage: acme.json
+      dnsChallenge:
+        provider: cloudflare
+        resolvers:
+          - "1.1.1.1:53"
+          - "1.0.0.1:53"
       tlschallenge: true
       httpchallenge:
         entrypoint: http
-      email: admin@tips-of-mine.fr
-      storage: /etc/traefik/acme/acme.json
 
 api:
-  insecure: true
+#  insecure: true
   dashboard: true
 
 log:
@@ -68,18 +67,18 @@ accesslog:
   bufferingSize: 100
 #  format: common
 
-# Ajout de la partie métrique qui concerne Prometheus
+# Ajout de la partie métrique qui concerne Prometheus
 metrics:
   prometheus:
-    # Nom du point d'entrée défini au dessus
+    # Nom du point d'entrée défini au dessus
     entryPoint: metrics
-    # On configure la latence des métriques
+    # On configure la latence des métriques
     buckets:
       - 0.1
       - 0.3
       - 1.2
       - 5.0
-    # Ajout des métriques sur les points d'entrée
+    # Ajout des métriques sur les points d'entrée
     addEntryPointsLabels: true
     # Ajout des services
     addServicesLabels: true

Traefik/docker-compose.yml

@@ -1,3 +1,4 @@
+
 #### NETWORKS
 networks:
   back_network:
@@ -26,24 +27,12 @@ services:
       - "./configs/dynamic:/etc/traefik/dynamic"
       - "./certificates/acme.json:/etc/traefik/acme/acme.json"
       - "./certificates:/etc/traefik/ssl"
-<<<<<<< HEAD
-<<<<<<< HEAD
       - "./log:/var/log"
-=======
-      - "./traefik/log:/var/log"
->>>>>>> 8e9a2c2beb8c28880271da161158adf0cb6617e0
-=======
-      - "./log:/var/log"
->>>>>>> 788e10b187487aabd04ab6b559995c1fa0994cb3
     networks:
       - back_network
       - front_network
 
-<<<<<<< HEAD
 ### Certificats
-=======
-# Certificats
->>>>>>> 8e9a2c2beb8c28880271da161158adf0cb6617e0
   reverse-proxy-https-helper:
     container_name: traefik-certificat
     image: alpine
@@ -53,41 +42,19 @@ services:
     volumes:
       - "./certificates:/etc/traefik/ssl"
     networks:
-<<<<<<< HEAD
-#      - back-network
       - front_network
 
 ### whoami
-=======
-      - front_network
-
-# whoami
->>>>>>> 8e9a2c2beb8c28880271da161158adf0cb6617e0
   whoami:
     container_name: whoami
     hostname: whoami
     image: traefik/whoami
-<<<<<<< HEAD
-    restart: always
-=======
     restart: unless-stopped
->>>>>>> 8e9a2c2beb8c28880271da161158adf0cb6617e0
     networks:
       - front_network
     labels:
       - "traefik.enable=true"
       - "traefik.docker.network=front_network"
-<<<<<<< HEAD
-## HTTP
-      - "traefik.http.routers.whoami-http.rule=Host(`whoami.10.0.4.29.traefik.me`)"
-      - "traefik.http.routers.whoami-http.entrypoints=http"
-## HTTPS
-      - "traefik.http.routers.whoami-https.rule=Host(`whoami.10.0.4.29.traefik.me`)"
-      - "traefik.http.routers.whoami-https.entrypoints=https"
-      - "traefik.http.routers.whoami-https.tls=true"
-## Middleware
-## Service
-=======
 # HTTP
       - "traefik.http.routers.whoami-http.rule=Host(`whoami.10.0.4.29.traefik.me`)"
       - "traefik.http.routers.whoami-http.entrypoints=http"
@@ -97,4 +64,3 @@ services:
       - "traefik.http.routers.whoami-https.tls=true"
 # Middleware
 # Service
->>>>>>> 8e9a2c2beb8c28880271da161158adf0cb6617e0