Merge v2.11 into v3.0

integration/fixtures/proxy-protocol/proxy-protocol.toml

@@ -7,10 +7,14 @@
   noColor = true
 
 [entryPoints]
-  [entryPoints.web]
+  [entryPoints.trust]
     address = ":8000"
-    [entryPoints.web.proxyProtocol]
-      trustedIPs = ["{{.HaproxyIP}}"]
+    [entryPoints.trust.proxyProtocol]
+      trustedIPs = ["127.0.0.1"]
+  [entryPoints.nottrust]
+      address = ":9000"
+      [entryPoints.nottrust.proxyProtocol]
+        trustedIPs = ["1.2.3.4"]
 
 [api]
   insecure = true

integration/fixtures/proxy-protocol/without.toml

@@ -1,33 +0,0 @@
-[global]
-  checkNewVersion = false
-  sendAnonymousUsage = false
-
-[log]
-  level = "DEBUG"
-  noColor = true
-
-[entryPoints]
-  [entryPoints.web]
-    address = ":8000"
-    [entryPoints.web.proxyProtocol]
-      trustedIPs = ["1.2.3.4"]
-
-[api]
-  insecure = true
-
-[providers.file]
-  filename = "{{ .SelfFilename }}"
-
-## dynamic configuration ##
-
-[http.routers]
-  [http.routers.router1]
-    service = "service1"
-    rule = "Path(`/whoami`)"
-
-[http.services]
-  [http.services.service1]
-    [http.services.service1.loadBalancer]
-
-      [[http.services.service1.loadBalancer.servers]]
-        url = "http://{{.WhoamiIP}}"

integration/fixtures/tcp/ip-allowlist.toml

@@ -5,6 +5,7 @@
 [log]
   level = "DEBUG"
 
+
 [entryPoints]
   [entryPoints.tcp]
     address = ":8093"
@@ -24,16 +25,16 @@
       rule = "HostSNI(`whoami-a.test`)"
       service = "whoami-a"
       middlewares = ["blocking-ipallowlist"]
-      [tcp.routers.to-whoami-a.tls]
-        passthrough = true
+    [tcp.routers.to-whoami-a.tls]
+      passthrough = true
 
     [tcp.routers.to-whoami-b]
       entryPoints = ["tcp"]
       rule = "HostSNI(`whoami-b.test`)"
       service = "whoami-b"
       middlewares = ["allowing-ipallowlist"]
-      [tcp.routers.to-whoami-b.tls]
-        passthrough = true
+    [tcp.routers.to-whoami-b.tls]
+      passthrough = true
 
   [tcp.services]
     [tcp.services.whoami-a.loadBalancer]
@@ -44,8 +45,8 @@
       [[tcp.services.whoami-b.loadBalancer.servers]]
         address = "{{ .WhoamiB }}"
 
-  [tcp.middlewares]
-    [tcp.middlewares.allowing-ipallowlist.ipAllowList]
-      sourceRange = ["127.0.0.1/32"]
-    [tcp.middlewares.blocking-ipallowlist.ipAllowList]
-      sourceRange = ["127.127.127.127/32"]
+[tcp.middlewares]
+  [tcp.middlewares.allowing-ipallowlist.ipAllowList]
+    sourceRange = ["127.0.0.1/32"]
+  [tcp.middlewares.blocking-ipallowlist.ipAllowList]
+    sourceRange = ["127.127.127.127/32"]