fix: configuration for integration tests.

integration/fixtures/access_log_config.toml

@@ -1,11 +1,11 @@
-[log]
-logLevel = "ERROR"
-filePath = "traefik.log"
-
 [global]
 checkNewVersion = false
 sendAnonymousUsage = false
 
+[log]
+logLevel = "ERROR"
+filePath = "traefik.log"
+
 [accessLog]
   filePath = "access.log"
 

integration/fixtures/acme/acme_base.toml

@@ -1,5 +1,9 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
-  logLevel = "DEBUG"
+logLevel = "DEBUG"
 
 [entrypoints]
   [entrypoints.web]

integration/fixtures/acme/acme_tls.toml

@@ -1,5 +1,9 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
-  logLevel = "DEBUG"
+logLevel = "DEBUG"
 
 [entrypoints]
   [entrypoints.web]

integration/fixtures/acme/acme_tls_dynamic.toml

@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 

integration/fixtures/acme/acme_tls_multiple_entrypoints.toml

@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 

integration/fixtures/docker/minimal.toml

@@ -1,3 +1,6 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
 
 [log]
 logLevel = "DEBUG"

integration/fixtures/docker/simple.toml

@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 

integration/fixtures/error_pages/error.toml

@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 

integration/fixtures/error_pages/simple.toml

@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 

integration/fixtures/file/56-simple-panic.toml

@@ -1,5 +1,9 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
-  logLevel = "DEBUG"
+logLevel = "DEBUG"
 
 [entrypoints]
   [entrypoints.web]

integration/fixtures/file/directory.toml

@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 

integration/fixtures/file/simple.toml

@@ -1,11 +1,14 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"
 
 [entrypoints]
   [entrypoints.web]
     address = ":8000"
 
-[log]
-logLevel = "DEBUG"
-
 [providers]
    [providers.file]
 

integration/fixtures/grpc/config.toml

@@ -1,9 +1,13 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"
+
 [serversTransport]
 rootCAs = [ """{{ .CertContent }}""" ]
 
-[global]
-debug = true
-
 [entrypoints]
   [entrypoints.web-secure]
     address = ":4443"

integration/fixtures/grpc/config_h2c.toml

@@ -1,5 +1,9 @@
 [global]
-debug = true
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"
 
 [entrypoints]
   [entrypoints.web]

integration/fixtures/grpc/config_h2c_termination.toml

@@ -1,5 +1,9 @@
 [global]
-debug = true
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"
 
 [entrypoints]
   [entrypoints.web-secure]

integration/fixtures/grpc/config_insecure.toml

@@ -1,10 +1,13 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"
 
 [serversTransport]
 insecureSkipVerify = true
 
-[global]
-debug = true
-
 [entrypoints]
   [entrypoints.web-secure]
     address = ":4443"

integration/fixtures/grpc/config_retry.toml

@@ -1,3 +1,10 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"
+
 [serversTransport]
 rootCAs = [ """{{ .CertContent }}""" ]
 

integration/fixtures/grpc/config_with_flush.toml

@@ -1,3 +1,9 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"
 
 [serversTransport]
 rootCAs = [ """{{ .CertContent }}""" ]

integration/fixtures/headers/basic.toml

@@ -1,11 +1,14 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"
 
 [entrypoints]
   [entrypoints.web]
     address = ":8000"
 
-[log]
-logLevel = "DEBUG"
-
 [providers]
    [providers.file]
 

integration/fixtures/headers/cors.toml

@@ -1,11 +1,14 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"
 
 [entrypoints]
   [entrypoints.web]
     address = ":8000"
 
-[log]
-logLevel = "DEBUG"
-
 [providers]
    [providers.file]
 

integration/fixtures/healthcheck/multiple-entrypoints-drr.toml

@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 

integration/fixtures/healthcheck/multiple-entrypoints-wrr.toml

@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 

integration/fixtures/healthcheck/port_overload.toml

@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 

integration/fixtures/healthcheck/simple.toml

@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 

integration/fixtures/https/clientca/https_1ca1config.toml

@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 

integration/fixtures/https/clientca/https_2ca1config.toml

@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 

integration/fixtures/https/clientca/https_2ca2config.toml

@@ -1,7 +1,10 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 
-
 [entrypoints]
   [entrypoints.web-secure]
   address = ":4443"

integration/fixtures/https/dynamic_https_sni.toml

@@ -1,5 +1,9 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
-  logLevel = "DEBUG"
+logLevel = "DEBUG"
 
 [entrypoints]
   [entrypoints.web-secure]

integration/fixtures/https/dynamic_https_sni_default_cert.toml

@@ -1,5 +1,9 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
-   logLevel = "DEBUG"
+logLevel = "DEBUG"
 
 [entrypoints]
   [entrypoints.web-secure]

integration/fixtures/https/https_redirect.toml

@@ -1,5 +1,9 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
-  logLevel = "DEBUG"
+logLevel = "DEBUG"
 
 [entrypoints]
   [entrypoints.web]

integration/fixtures/https/https_sni.toml

@@ -1,5 +1,9 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
-  logLevel = "DEBUG"
+logLevel = "DEBUG"
 
 [entrypoints]
   [entrypoints.web-secure]

integration/fixtures/https/https_sni_case_insensitive_dynamic.toml

@@ -1,3 +1,8 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
 logLevel = "DEBUG"
 
 [entrypoints]

integration/fixtures/https/https_sni_default_cert.toml

@@ -1,5 +1,9 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
-   logLevel = "DEBUG"
+logLevel = "DEBUG"
 
 [entrypoints]
   [entrypoints.web-secure]

integration/fixtures/https/https_sni_strict.toml

@@ -1,5 +1,9 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
-  logLevel = "DEBUG"
+logLevel = "DEBUG"
 
 [entrypoints]
   [entrypoints.web-secure]

integration/fixtures/https/rootcas/https.toml

@@ -1,7 +1,10 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 
-
 [serversTransport]
 # Use certificate in net/internal/testcert.go
 rootCAs =  [ """

integration/fixtures/https/rootcas/https_with_file.toml

@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 

integration/fixtures/k8s_crd.toml

@@ -1,5 +1,9 @@
 [global]
-debug=true
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"
 
 [entryPoints]
   [entryPoints.web]

integration/fixtures/k8s_default.toml

@@ -1,5 +1,9 @@
 [global]
-debug=true
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"
 
 [entryPoints]
   [entryPoints.web]

integration/fixtures/keep_trailing_slash.toml

@@ -1,25 +0,0 @@
-keepTrailingSlash = {{ .KeepTrailingSlash }}
-
-[log]
-logLevel = "DEBUG"
-
-
-[entrypoints]
-  [entrypoints.web]
-  address = ":8000"
-
-[providers]
-   [providers.file]
-
-# rules
-[backends]
-  [backends.backend1]
-    [backends.backend1.servers.server1]
-       url = "http://172.17.0.2:80"
-       weight = 1
-
-[frontends]
-  [frontends.frontend1]
-     backend = "backend1"
-     [frontends.frontend1.routes.test_1]
-        rule = "Path(`/test/foo`)"

integration/fixtures/log_rotation_config.toml

@@ -1,30 +1,23 @@
-################################################################
+[global]
-# Global configuration
+checkNewVersion = false
-################################################################
+sendAnonymousUsage = false
-[accessLog]
-filePath = "access.log"
 
 [log]
 filePath = "traefik.log"
 logLevel = "ERROR"
 
+[accessLog]
+filePath = "access.log"
+
 [entrypoints]
   [entrypoints.web]
   address = ":8000"
   [entrypoints.api]
   address = ":7888"
 
-checkNewVersion = false
-
-################################################################
-# Api configuration backend
-################################################################
 [api]
 entryPoint = "api"
 
-################################################################
-# File configuration backend
-################################################################
 [providers]
    [providers.file]
 

integration/fixtures/marathon/simple.toml

@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 

integration/fixtures/multiple_provider.toml

@@ -1,5 +1,9 @@
 [global]
-debug=true
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"
 
 [entrypoints]
   [entrypoints.web]

integration/fixtures/multiprovider.toml

@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 

integration/fixtures/proxy-protocol/with.toml

@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 

integration/fixtures/proxy-protocol/without.toml

@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 

integration/fixtures/ratelimit/simple.toml

@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 

integration/fixtures/reqacceptgrace.toml

@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 
@@ -12,6 +16,8 @@ logLevel = "DEBUG"
 [entrypoints.traefik.transport.lifeCycle]
     RequestAcceptGraceTimeout = "10s"
 
+[ping]
+
 [providers]
    [providers.file]
 
@@ -28,4 +34,3 @@ logLevel = "DEBUG"
         URL = "{{.Server}}"
         Weight = 1
 
-[ping]

integration/fixtures/rest/simple.toml

@@ -1,3 +1,9 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"
 
 [entrypoints]
   [entrypoints.web]
@@ -5,8 +11,5 @@
 
 [api]
 
-[log]
-logLevel = "DEBUG"
-
 [providers]
    [providers.rest]

integration/fixtures/retry/simple.toml

@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 

integration/fixtures/simple_auth.toml

@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 

integration/fixtures/simple_default.toml

@@ -1,3 +1,6 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
 
 [entrypoints]
   [entrypoints.web]

integration/fixtures/simple_hostresolver.toml

@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 

integration/fixtures/simple_stats.toml

@@ -1,5 +1,9 @@
 [global]
-debug=true
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"
 
 [entrypoints]
   [entrypoints.web]

integration/fixtures/simple_web.toml

@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 

integration/fixtures/simple_whitelist.toml

@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 

integration/fixtures/tcp/mixed.toml

@@ -1,3 +1,10 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"
+
 [entrypoints]
   [entrypoints.tcp]
     address = ":8093"

integration/fixtures/tcp/non-tls-fallback.toml

@@ -1,12 +1,16 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"
+
 [entrypoints]
   [entrypoints.tcp]
     address = ":8093"
 
 [api]
 
-[global]
-   debug = true
-
 [providers.file]
 
 [tcp]

integration/fixtures/tcp/non-tls.toml

@@ -1,12 +1,16 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"
+
 [entrypoints]
   [entrypoints.tcp]
     address = ":8093"
 
 [api]
 
-[global]
-   debug = true
-
 [providers.file]
 
 [tcp]

integration/fixtures/timeout/forwarding_timeouts.toml

@@ -1,12 +1,14 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 
-
 [serversTransport.forwardingTimeouts]
   dialTimeout = "300ms"
   responseHeaderTimeout = "300ms"
 
-
 [entrypoints]
   [entrypoints.web]
     address = ":8000"
@@ -16,7 +18,6 @@ logLevel = "DEBUG"
 
 [api]
 
-
 [providers]
    [providers.file]
 

integration/fixtures/tlsclientheaders/simple.toml

@@ -1,9 +1,10 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 
-[global]
-debug = true
-
 [serversTransport]
 rootCAs = [ """{{ .RootCertContent }}""" ]
 

integration/fixtures/tracing/simple.toml

@@ -1,9 +1,10 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 
-[global]
-debug = true
-
 [api]
 
 [entrypoints]

integration/fixtures/traefik_log_config.toml

@@ -1,13 +1,11 @@
-################################################################
+[global]
-# Global configuration
+checkNewVersion = false
-################################################################
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 filePath = "traefik.log"
 
-[global]
-checkNewVersion = false
-
 [accessLog]
   filePath = "access.log"
 

integration/fixtures/websocket/config.toml

@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 

integration/fixtures/websocket/config_https.toml

@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 
@@ -10,7 +14,6 @@ insecureSkipVerify=true
 
 [api]
 
-
 [providers]
    [providers.file]
 

integration/simple_test.go

@@ -432,30 +432,6 @@ func (s *SimpleSuite) TestXForwardedHeaders(c *check.C) {
 	c.Assert(err, checker.IsNil)
 }
 
-func (s *SimpleSuite) TestKeepTrailingSlash(c *check.C) {
-	file := s.adaptFile(c, "fixtures/keep_trailing_slash.toml", struct {
-		KeepTrailingSlash bool
-	}{true})
-	defer os.Remove(file)
-
-	cmd, output := s.traefikCmd(withConfigFile(file))
-	defer output(c)
-
-	err := cmd.Start()
-	c.Assert(err, checker.IsNil)
-	defer cmd.Process.Kill()
-
-	oldCheckRedirect := http.DefaultClient.CheckRedirect
-	http.DefaultClient.CheckRedirect = func(req *http.Request, via []*http.Request) error {
-		return http.ErrUseLastResponse
-	}
-
-	err = try.GetRequest("http://127.0.0.1:8000/test/foo/", 1*time.Second, try.StatusCodeIs(http.StatusNotFound))
-	c.Assert(err, checker.IsNil)
-
-	http.DefaultClient.CheckRedirect = oldCheckRedirect
-}
-
 func (s *SimpleSuite) TestMultiprovider(c *check.C) {
 	s.createComposeProject(c, "base")
 	s.composeProject.Start(c)