From 3a5aa090d59ba6aa06ebbdc7c5f50b1d3707b575 Mon Sep 17 00:00:00 2001
From: Quentin Dufour <quentin@deuxfleurs.fr>
Date: Tue, 14 Jan 2020 08:33:58 +0100
Subject: [PATCH] Upgrade Traefik + Config tweaking

---
 consul/configuration/traefik/traefik.toml.sample | 10 +++++-----
 nomad/traefik.hcl                                |  2 +-
 nomad/web_static.hcl                             |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/consul/configuration/traefik/traefik.toml.sample b/consul/configuration/traefik/traefik.toml.sample
index fbfc745..1e34554 100644
--- a/consul/configuration/traefik/traefik.toml.sample
+++ b/consul/configuration/traefik/traefik.toml.sample
@@ -25,15 +25,15 @@ defaultEntryPoints = ["http", "https"]
   entryPoint = "https"
   onHostRule = true
 
-  [acme.dnsChallenge]
-    provider = "cloudflare"
-    delayBeforeCheck = 0
+#  [acme.dnsChallenge]
+#    provider = "cloudflare"
+#    delayBeforeCheck = 0
 
   [acme.httpChallenge]
     entryPoint = "http"
 
-[[acme.domains]]
-  main = "deuxfleurs.fr"
+#[[acme.domains]]
+#  main = "deuxfleurs.fr"
 
 [api]
   entryPoint = "admin"
diff --git a/nomad/traefik.hcl b/nomad/traefik.hcl
index f383090..8b9788e 100644
--- a/nomad/traefik.hcl
+++ b/nomad/traefik.hcl
@@ -7,7 +7,7 @@ job "frontend" {
       driver = "docker"
 
       config {
-        image = "amd64/traefik:1.7.9"
+        image = "amd64/traefik:1.7.20"
         readonly_rootfs = true
         port_map {
           https_port = 443
diff --git a/nomad/web_static.hcl b/nomad/web_static.hcl
index 27143a5..0dca948 100644
--- a/nomad/web_static.hcl
+++ b/nomad/web_static.hcl
@@ -28,8 +28,8 @@ job "web_static" {
         tags = [
           "webstatic",
           "traefik.enable=true",
-          "traefik.frontend.entryPoints=https",
-          "traefik.frontend.rule=Host:deuxfleurs.fr,www.deuxfleurs.fr;Path:/,/robots.txt,/landing/arobase.png"
+          "traefik.frontend.entryPoints=https,http",
+          "traefik.frontend.rule=Host:deuxfleurs.fr,www.deuxfleurs.fr,deuxfleurs.org,www.deuxfleurs.org;Path:/,/robots.txt,/landing/arobase.png"
         ]
         port = "web_port"
         address_mode = "host"