Restrict traefik.toml to static configuration.

2019-07-15 10:22:03 +02:00 · 2019-07-15 10:22:03 +02:00 · 093658836e
commit 093658836e
parent f49800e56a
78 changed files with 274 additions and 440 deletions
--- a/integration/fixtures/acme/acme_base.toml
+++ b/integration/fixtures/acme/acme_base.toml
@ -39,8 +39,8 @@

 [api]

-[providers]
-  [providers.file]
+[providers.file]
+  filename = "{{ .SelfFilename }}"

 ## dynamic configuration ##

--- a/integration/fixtures/acme/acme_tls.toml
+++ b/integration/fixtures/acme/acme_tls.toml
@ -39,8 +39,8 @@

 [api]

-[providers]
-  [providers.file]
+[providers.file]
+  filename = "{{ .SelfFilename }}"

 ## dynamic configuration ##

--- a/integration/fixtures/error_pages/error.toml
+++ b/integration/fixtures/error_pages/error.toml
@ -9,8 +9,8 @@
  [entryPoints.web]
    address = ":8080"

-[providers]
-  [providers.file]
+[providers.file]
+  filename = "{{ .SelfFilename }}"

 ## dynamic configuration ##

--- a/integration/fixtures/error_pages/simple.toml
+++ b/integration/fixtures/error_pages/simple.toml
@ -9,8 +9,8 @@
  [entryPoints.web]
    address = ":8080"

-[providers]
-  [providers.file]
+[providers.file]
+  filename = "{{ .SelfFilename }}"

 ## dynamic configuration ##

--- a/integration/fixtures/file/56-simple-panic.toml
+++ b/integration/fixtures/file/56-simple-panic.toml
@ -9,5 +9,5 @@
  [entryPoints.web]
    address = ":8000"

-[providers]
-  [providers.file]
+[providers.file]
+  filename = "{{ .SelfFilename }}"
--- a/integration/fixtures/file/simple-hosts.toml
+++ b/integration/fixtures/file/simple-hosts.toml
@ -9,8 +9,8 @@
  [entryPoints.web]
    address = ":8000"

-[providers]
-  [providers.file]
+[providers.file]
+  filename = "{{ .SelfFilename }}"

 ## dynamic configuration ##

--- a/integration/fixtures/file/simple.toml
+++ b/integration/fixtures/file/simple.toml
@ -9,8 +9,8 @@
  [entryPoints.web]
    address = ":8000"

-[providers]
-  [providers.file]
+[providers.file]
+  filename = "{{ .SelfFilename }}"

 ## dynamic configuration ##

--- a/integration/fixtures/grpc/config.toml
+++ b/integration/fixtures/grpc/config.toml
@ -14,8 +14,8 @@

 [api]

-[providers]
-  [providers.file]
+[providers.file]
+  filename = "{{ .SelfFilename }}"

 ## dynamic configuration ##

--- a/integration/fixtures/grpc/config_h2c.toml
+++ b/integration/fixtures/grpc/config_h2c.toml
@ -11,8 +11,8 @@

 [api]

-[providers]
-  [providers.file]
+[providers.file]
+  filename = "{{ .SelfFilename }}"

 ## dynamic configuration ##

--- a/integration/fixtures/grpc/config_h2c_termination.toml
+++ b/integration/fixtures/grpc/config_h2c_termination.toml
@ -11,8 +11,8 @@

 [api]

-[providers]
-  [providers.file]
+[providers.file]
+  filename = "{{ .SelfFilename }}"

 ## dynamic configuration ##

--- a/integration/fixtures/grpc/config_insecure.toml
+++ b/integration/fixtures/grpc/config_insecure.toml
@ -14,8 +14,8 @@

 [api]

-[providers]
-  [providers.file]
+[providers.file]
+  filename = "{{ .SelfFilename }}"

 ## dynamic configuration ##

--- a/integration/fixtures/grpc/config_retry.toml
+++ b/integration/fixtures/grpc/config_retry.toml
@ -14,8 +14,8 @@

 [api]

-[providers]
-  [providers.file]
+[providers.file]
+  filename = "{{ .SelfFilename }}"

 ## dynamic configuration ##

--- a/integration/fixtures/headers/cors.toml
+++ b/integration/fixtures/headers/cors.toml
@ -9,8 +9,8 @@
  [entryPoints.web]
    address = ":8000"

-[providers]
-  [providers.file]
+[providers.file]
+  filename = "{{ .SelfFilename }}"

 ## dynamic configuration ##

--- a/integration/fixtures/healthcheck/multiple-entrypoints.toml
+++ b/integration/fixtures/healthcheck/multiple-entrypoints.toml
@ -13,8 +13,8 @@

 [api]

-[providers]
-  [providers.file]
+[providers.file]
+  filename = "{{ .SelfFilename }}"

 ## dynamic configuration ##

--- a/integration/fixtures/healthcheck/port_overload.toml
+++ b/integration/fixtures/healthcheck/port_overload.toml
@ -11,8 +11,8 @@

 [api]

-[providers]
-  [providers.file]
+[providers.file]
+  filename = "{{ .SelfFilename }}"

 ## dynamic configuration ##

--- a/integration/fixtures/healthcheck/simple.toml
+++ b/integration/fixtures/healthcheck/simple.toml
@ -11,8 +11,8 @@

 [api]

-[providers]
-  [providers.file]
+[providers.file]
+  filename = "{{ .SelfFilename }}"

 ## dynamic configuration ##

--- a/integration/fixtures/https/clientca/https_1ca1config.toml
+++ b/integration/fixtures/https/clientca/https_1ca1config.toml
@ -11,8 +11,8 @@

 [api]

-[providers]
-  [providers.file]
+[providers.file]
+  filename = "{{ .SelfFilename }}"

 ## dynamic configuration ##

--- a/integration/fixtures/https/clientca/https_2ca1config.toml
+++ b/integration/fixtures/https/clientca/https_2ca1config.toml
@ -11,8 +11,8 @@

 [api]

-[providers]
-  [providers.file]
+[providers.file]
+  filename = "{{ .SelfFilename }}"

 ## dynamic configuration ##

--- a/integration/fixtures/https/clientca/https_2ca2config.toml
+++ b/integration/fixtures/https/clientca/https_2ca2config.toml
@ -11,8 +11,8 @@

 [api]

-[providers]
-  [providers.file]
+[providers.file]
+  filename = "{{ .SelfFilename }}"

 ## dynamic configuration ##

--- a/integration/fixtures/https/dynamic_https_sni_default_cert.toml
+++ b/integration/fixtures/https/dynamic_https_sni_default_cert.toml
@ -11,8 +11,8 @@

 [api]

-[providers]
-  [providers.file]
+[providers.file]
+  filename = "{{ .SelfFilename }}"

 ## dynamic configuration ##

--- a/integration/fixtures/https/https_redirect.toml
+++ b/integration/fixtures/https/https_redirect.toml
@ -14,8 +14,8 @@

 [api]

-[providers]
-  [providers.file]
+[providers.file]
+  filename = "{{ .SelfFilename }}"

 ## dynamic configuration ##

--- a/integration/fixtures/https/https_sni.toml
+++ b/integration/fixtures/https/https_sni.toml
@ -11,8 +11,8 @@

 [api]

-[providers]
-  [providers.file]
+[providers.file]
+  filename = "{{ .SelfFilename }}"

 ## dynamic configuration ##

--- a/integration/fixtures/https/https_sni_case_insensitive_dynamic.toml
+++ b/integration/fixtures/https/https_sni_case_insensitive_dynamic.toml
@ -11,8 +11,8 @@

 [api]

-[providers]
-  [providers.file]
+[providers.file]
+  filename = "{{ .SelfFilename }}"

 ## dynamic configuration ##

--- a/integration/fixtures/https/https_sni_default_cert.toml
+++ b/integration/fixtures/https/https_sni_default_cert.toml
@ -11,8 +11,8 @@

 [api]

-[providers]
-  [providers.file]
+[providers.file]
+  filename = "{{ .SelfFilename }}"

 ## dynamic configuration ##

--- a/integration/fixtures/https/https_sni_strict.toml
+++ b/integration/fixtures/https/https_sni_strict.toml
@ -11,8 +11,8 @@

 [api]

-[providers]
-  [providers.file]
+[providers.file]
+  filename = "{{ .SelfFilename }}"

 ## dynamic configuration ##

--- a/integration/fixtures/https/https_tls_options.toml
+++ b/integration/fixtures/https/https_tls_options.toml
@ -11,8 +11,8 @@

 [api]

-[providers]
-  [providers.file]
+[providers.file]
+  filename = "{{ .SelfFilename }}"

 ## dynamic configuration ##

--- a/integration/fixtures/https/rootcas/https.toml
+++ b/integration/fixtures/https/rootcas/https.toml
@ -30,8 +30,8 @@ fblo6RBxUQ==

 [api]

-[providers]
-  [providers.file]
+[providers.file]
+  filename = "{{ .SelfFilename }}"

 ## dynamic configuration ##

--- a/integration/fixtures/https/rootcas/https_with_file.toml
+++ b/integration/fixtures/https/rootcas/https_with_file.toml
@ -15,8 +15,8 @@

 [api]

-[providers]
-  [providers.file]
+[providers.file]
+  filename = "{{ .SelfFilename }}"

 ## dynamic configuration ##

--- a/integration/fixtures/log_rotation_config.toml
+++ b/integration/fixtures/log_rotation_config.toml
@ -1,36 +0,0 @@
-[global]
-  checkNewVersion = false
-  sendAnonymousUsage = false
-
-[log]
-  filePath = "traefik.log"
-  level = "ERROR"
-
-[accessLog]
-  filePath = "access.log"
-
-[entryPoints]
-  [entryPoints.web]
-    address = ":8000"
-  [entryPoints.api]
-    address = ":7888"
-
-[api]
-  entryPoint = "api"
-
-[providers]
-  [providers.file]
-
-## dynamic configuration ##
-
-[http.routers]
-  [http.routers.router1]
-    Service = "service1"
-    rule = "Path(`/test1`)"
-
-[http.services]
-  [http.services.service1]
-    [http.services.service1.loadBalancer]
-
-      [[http.services.service1.loadBalancer.servers]]
-        url = "http://127.0.0.1:8081"
--- a/integration/fixtures/multiple_provider.toml
+++ b/integration/fixtures/multiple_provider.toml
@ -17,6 +17,7 @@
    exposedByDefault = false

  [providers.file]
+    filename = "{{ .SelfFilename }}"

 ## dynamic configuration ##

--- a/integration/fixtures/multiprovider.toml
+++ b/integration/fixtures/multiprovider.toml
@ -15,6 +15,7 @@
  [providers.rest]

  [providers.file]
+    filename = "{{ .SelfFilename }}"

 ## dynamic configuration ##

--- a/integration/fixtures/proxy-protocol/with.toml
+++ b/integration/fixtures/proxy-protocol/with.toml
@ -13,8 +13,8 @@

 [api]

-[providers]
-  [providers.file]
+[providers.file]
+  filename = "{{ .SelfFilename }}"

 ## dynamic configuration ##

--- a/integration/fixtures/proxy-protocol/without.toml
+++ b/integration/fixtures/proxy-protocol/without.toml
@ -13,8 +13,8 @@

 [api]

-[providers]
-  [providers.file]
+[providers.file]
+  filename = "{{ .SelfFilename }}"

 ## dynamic configuration ##

--- a/integration/fixtures/ratelimit/simple.toml
+++ b/integration/fixtures/ratelimit/simple.toml
@ -15,8 +15,8 @@
  [entryPoints.api]
    address = ":8080"

-[providers]
-  [providers.file]
+[providers.file]
+  filename = "{{ .SelfFilename }}"

 ## dynamic configuration ##

--- a/integration/fixtures/reqacceptgrace.toml
+++ b/integration/fixtures/reqacceptgrace.toml
@ -19,8 +19,8 @@

 [ping]

-[providers]
-  [providers.file]
+[providers.file]
+  filename = "{{ .SelfFilename }}"

 ## dynamic configuration ##

@ -32,5 +32,5 @@
 [http.services]
    [http.services.service.loadBalancer]
      [[http.services.service.loadBalancer.servers]]
-        url = "{{.Server}}"
+        url = "{{ .Server }}"

--- a/integration/fixtures/retry/simple.toml
+++ b/integration/fixtures/retry/simple.toml
@ -11,8 +11,8 @@

 [api]

-[providers]
-  [providers.file]
+[providers.file]
+  filename = "{{ .SelfFilename }}"

 ## dynamic configuration ##

--- a/integration/fixtures/simple_auth.toml
+++ b/integration/fixtures/simple_auth.toml
@ -18,6 +18,9 @@
 [ping]

 [providers.file]
+  filename = "{{ .SelfFilename }}"
+
+## dynamic configuration ##

 [http.middlewares]
  [http.middlewares.authentication.basicAuth]
--- a/integration/fixtures/simple_stats.toml
+++ b/integration/fixtures/simple_stats.toml
@ -12,6 +12,7 @@
 [api]

 [providers.file]
+  filename = "{{ .SelfFilename }}"

 ## dynamic configuration ##

--- a/integration/fixtures/tcp/catch-all-no-tls-with-https.toml
+++ b/integration/fixtures/tcp/catch-all-no-tls-with-https.toml
@ -12,6 +12,7 @@
 [api]

 [providers.file]
+  filename = "{{ .SelfFilename }}"

 ## dynamic configuration ##

--- a/integration/fixtures/tcp/catch-all-no-tls.toml
+++ b/integration/fixtures/tcp/catch-all-no-tls.toml
@ -12,6 +12,7 @@
 [api]

 [providers.file]
+  filename = "{{ .SelfFilename }}"

 ## dynamic configuration ##

--- a/integration/fixtures/tcp/mixed.toml
+++ b/integration/fixtures/tcp/mixed.toml
@ -12,6 +12,7 @@
 [api]

 [providers.file]
+  filename = "{{ .SelfFilename }}"

 ## dynamic configuration ##

--- a/integration/fixtures/tcp/multi-tls-options.toml
+++ b/integration/fixtures/tcp/multi-tls-options.toml
@ -12,6 +12,7 @@
 [api]

 [providers.file]
+  filename = "{{ .SelfFilename }}"

 ## dynamic configuration ##

--- a/integration/fixtures/tcp/non-tls-fallback.toml
+++ b/integration/fixtures/tcp/non-tls-fallback.toml
@ -12,6 +12,9 @@
 [api]

 [providers.file]
+  filename = "{{ .SelfFilename }}"
+
+## dynamic configuration ##

 [tcp]
  [tcp.routers]
--- a/integration/fixtures/tcp/non-tls.toml
+++ b/integration/fixtures/tcp/non-tls.toml
@ -12,6 +12,7 @@
 [api]

 [providers.file]
+  filename = "{{ .SelfFilename }}"

 ## dynamic configuration ##

--- a/integration/fixtures/timeout/forwarding_timeouts.toml
+++ b/integration/fixtures/timeout/forwarding_timeouts.toml
@ -18,8 +18,8 @@

 [api]

-[providers]
-  [providers.file]
+[providers.file]
+  filename = "{{ .SelfFilename }}"

 ## dynamic configuration ##

--- a/integration/fixtures/timeout/keepalive.toml
+++ b/integration/fixtures/timeout/keepalive.toml
@ -14,8 +14,8 @@

 [api]

-[providers]
-  [providers.file]
+[providers.file]
+  filename = "{{ .SelfFilename }}"

 ## dynamic configuration ##

--- a/integration/fixtures/tlsclientheaders/simple.toml
+++ b/integration/fixtures/tlsclientheaders/simple.toml
@ -19,6 +19,7 @@
    watch = true

  [providers.file]
+    filename = "{{ .SelfFilename }}"

 ## dynamic configuration ##

--- a/integration/fixtures/tracing/simple-jaeger.toml
+++ b/integration/fixtures/tracing/simple-jaeger.toml
@ -19,8 +19,8 @@
    samplingServerURL = "http://{{.IP}}:5778/sampling"
    localAgentHostPort = "{{.IP}}:6831"

-[providers]
-  [providers.file]
+[providers.file]
+  filename = "{{ .SelfFilename }}"

 ## dynamic configuration ##

--- a/integration/fixtures/tracing/simple-zipkin.toml
+++ b/integration/fixtures/tracing/simple-zipkin.toml
@ -17,8 +17,8 @@
    httpEndpoint = "http://{{.IP}}:9411/api/v1/spans"
    debug = true

-[providers]
-  [providers.file]
+[providers.file]
+  filename = "{{ .SelfFilename }}"

 ## dynamic configuration ##

--- a/integration/fixtures/websocket/config.toml
+++ b/integration/fixtures/websocket/config.toml
@ -11,8 +11,8 @@

 [api]

-[providers]
-  [providers.file]
+[providers.file]
+  filename = "{{ .SelfFilename }}"

 ## dynamic configuration ##

--- a/integration/fixtures/websocket/config_https.toml
+++ b/integration/fixtures/websocket/config_https.toml
@ -14,8 +14,8 @@

 [api]

-[providers]
-  [providers.file]
+[providers.file]
+  filename = "{{ .SelfFilename }}"

 ## dynamic configuration ##