Fix redirect problem on dashboard + docs/tests on [web]

2018-01-11 09:46:03 +01:00 · 2018-01-11 09:46:03 +01:00 · e2c5f3712f
commit e2c5f3712f
parent d0f3ad6024
47 changed files with 134 additions and 88 deletions
--- a/integration/consul_test.go
+++ b/integration/consul_test.go
@ -294,7 +294,10 @@ func (s *ConsulSuite) skipTestGlobalConfigurationWithClientTLS(c *check.C) {
 	s.setupConsulTLS(c)
 	consulHost := s.composeProject.Container(c, "consul").NetworkSettings.IPAddress

-	err := s.kv.Put("traefik/web/address", []byte(":8081"), nil)
+	err := s.kv.Put("traefik/api/entrypoint", []byte("api"), nil)
+	c.Assert(err, checker.IsNil)
+
+	err = s.kv.Put("traefik/entrypoints/api/address", []byte(":8081"), nil)
 	c.Assert(err, checker.IsNil)

 	// wait for consul
@ -341,7 +344,7 @@ func (s *ConsulSuite) TestCommandStoreConfig(c *check.C) {
 		"/traefik/loglevel":                 "DEBUG",
 		"/traefik/defaultentrypoints/0":     "http",
 		"/traefik/entrypoints/http/address": ":8000",
-		"/traefik/web/address":              ":8080",
+		"/traefik/api/entrypoint":           "traefik",
 		"/traefik/consul/endpoint":          consulHost + ":8500",
 	}

--- a/integration/etcd3_test.go
+++ b/integration/etcd3_test.go
@ -411,7 +411,7 @@ func (s *Etcd3Suite) TestCommandStoreConfig(c *check.C) {
 		"/traefik/loglevel":                 "DEBUG",
 		"/traefik/defaultentrypoints/0":     "http",
 		"/traefik/entrypoints/http/address": ":8000",
-		"/traefik/web/address":              ":8080",
+		"/traefik/api/entrypoint":           "traefik",
 		"/traefik/etcd/endpoint":            ipEtcd + ":4001",
 	}

--- a/integration/etcd_test.go
+++ b/integration/etcd_test.go
@ -419,7 +419,7 @@ func (s *EtcdSuite) TestCommandStoreConfig(c *check.C) {
 		"/traefik/loglevel":                 "DEBUG",
 		"/traefik/defaultentrypoints/0":     "http",
 		"/traefik/entrypoints/http/address": ":8000",
-		"/traefik/web/address":              ":8080",
+		"/traefik/api/entrypoint":           "traefik",
 		"/traefik/etcd/endpoint":            etcdHost + ":4001",
 	}

--- a/integration/fixtures/access_log_config.toml
+++ b/integration/fixtures/access_log_config.toml
@ -8,14 +8,16 @@ defaultEntryPoints = ["http"]
 [entryPoints]
  [entryPoints.http]
  address = ":8000"
+  [entryPoints.api]
+  address = ":7888"

 checkNewVersion = false

 ################################################################
-# Web configuration backend
+# Api configuration
 ################################################################
-[web]
-address = ":7888"
+[api]
+entryPoint = "api"

 ################################################################
 # File configuration backend
--- a/integration/fixtures/consul/simple.toml
+++ b/integration/fixtures/consul/simple.toml
@ -5,6 +5,8 @@ logLevel = "DEBUG"
 [entryPoints]
  [entryPoints.http]
  address = ":8000"
+  [entryPoints.api]
+  address = ":8081"


 [consul]
@ -12,5 +14,5 @@ logLevel = "DEBUG"
  watch = true
  prefix = "traefik"

-[web]
-  address = ":8081"
+[api]
+  entryPoint = "api"
--- a/integration/fixtures/consul/simple_https.toml
+++ b/integration/fixtures/consul/simple_https.toml
@ -3,6 +3,8 @@ defaultEntryPoints = ["http","https"]
 logLevel = "DEBUG"

 [entryPoints]
+  [entryPoints.api]
+  address = ":8081"
  [entryPoints.http]
  address = ":8000"
  [entryPoints.https]
@ -16,5 +18,5 @@ logLevel = "DEBUG"
  prefix = "traefik"
  watch = true

-[web]
-  address = ":8081"
+[api]
+  entryPoint = "api"
--- a/integration/fixtures/consul_catalog/simple.toml
+++ b/integration/fixtures/consul_catalog/simple.toml
@ -1,8 +1,7 @@
 defaultEntryPoints = ["http"]
 logLevel = "DEBUG"

-[web]
-  address = ":8080"
+[api]

 [entryPoints]
  [entryPoints.http]
--- a/integration/fixtures/docker/simple.toml
+++ b/integration/fixtures/docker/simple.toml
@ -6,7 +6,7 @@ logLevel = "DEBUG"
  [entryPoints.http]
  address = ":8000"

-[web]
+[api]

 [docker]

--- a/integration/fixtures/dynamodb/simple.toml
+++ b/integration/fixtures/dynamodb/simple.toml
@ -5,6 +5,8 @@ logLevel = "DEBUG"
 [entryPoints]
  [entryPoints.http]
  address = ":8080"
+  [entryPoints.api]
+  address = ":8081"

 [dynamodb]
  AccessKeyID = "key"
@ -12,5 +14,5 @@ logLevel = "DEBUG"
  Endpoint = "{{.DynamoURL}}"
  Region = "us-east-1"

-[web]
-  address = ":8081"
+[api]
+  entryPoint = "api"
--- a/integration/fixtures/etcd/simple.toml
+++ b/integration/fixtures/etcd/simple.toml
@ -5,6 +5,8 @@ logLevel = "DEBUG"
 [entryPoints]
  [entryPoints.http]
  address = ":8000"
+  [entryPoints.api]
+  address = ":8081"


 [etcd]
@ -13,5 +15,5 @@ logLevel = "DEBUG"
  watch = true
  useAPIV3 = {{.UseAPIV3}}

-[web]
-  address = ":8081"
+[api]
+  entryPoint = "api"
--- a/integration/fixtures/etcd/simple_https.toml
+++ b/integration/fixtures/etcd/simple_https.toml
@ -3,6 +3,8 @@ defaultEntryPoints = ["http","https"]
 logLevel = "DEBUG"

 [entryPoints]
+  [entryPoints.api]
+  address = ":8081"
  [entryPoints.http]
  address = ":8000"
  [entryPoints.https]
@ -16,5 +18,6 @@ logLevel = "DEBUG"
 #  prefix = "/traefik"
 #  watch = true

-[web]
-  address = ":8081"
+
+[api]
+  entryPoint = "api"
--- a/integration/fixtures/eureka/simple.toml
+++ b/integration/fixtures/eureka/simple.toml
@ -10,5 +10,4 @@ logLevel = "DEBUG"
 [eureka]
  endpoint = "http://{{.EurekaHost}}:8761/eureka"
  delay = "1s"
-[web]
-  address = ":8080"
+[api]
--- a/integration/fixtures/grpc/config.toml
+++ b/integration/fixtures/grpc/config.toml
@ -11,8 +11,7 @@ RootCAs = [ """{{ .CertContent }}""" ]
     keyFile  = """{{ .KeyContent }}"""


-[web]
-  address = ":8080"
+[api]

 [file]

--- a/integration/fixtures/grpc/config_insecure.toml
+++ b/integration/fixtures/grpc/config_insecure.toml
@ -11,8 +11,7 @@ InsecureSkipVerify = true
     keyFile  = """{{ .KeyContent }}"""


-[web]
-  address = ":8080"
+[api]

 [file]

--- a/integration/fixtures/healthcheck/multiple-entrypoints-drr.toml
+++ b/integration/fixtures/healthcheck/multiple-entrypoints-drr.toml
@ -8,8 +8,7 @@ logLevel = "DEBUG"
  [entryPoints.http2]
  address = ":9000"

-[web]
-  address = ":8080"
+[api]

 [file]
 [backends]
--- a/integration/fixtures/healthcheck/multiple-entrypoints-wrr.toml
+++ b/integration/fixtures/healthcheck/multiple-entrypoints-wrr.toml
@ -8,8 +8,7 @@ logLevel = "DEBUG"
  [entryPoints.http2]
  address = ":9000"

-[web]
-  address = ":8080"
+[api]

 [file]
 [backends]
--- a/integration/fixtures/healthcheck/port_overload.toml
+++ b/integration/fixtures/healthcheck/port_overload.toml
@ -6,8 +6,7 @@ logLevel = "DEBUG"
  [entryPoints.http]
  address = ":8000"

-[web]
-  address = ":8080"
+[api]

 [file]
 [backends]
--- a/integration/fixtures/healthcheck/simple.toml
+++ b/integration/fixtures/healthcheck/simple.toml
@ -6,8 +6,7 @@ logLevel = "DEBUG"
  [entryPoints.http]
  address = ":8000"

-[web]
-  address = ":8080"
+[api]

 [file]
 [backends]
--- a/integration/fixtures/https/clientca/https_1ca1config.toml
+++ b/integration/fixtures/https/clientca/https_1ca1config.toml
@ -16,8 +16,7 @@ defaultEntryPoints = ["https"]
      certFile = "fixtures/https/snitest.org.cert"
      keyFile = "fixtures/https/snitest.org.key"

-[web]
-  address = ":8080"
+[api]

 [file]

--- a/integration/fixtures/https/clientca/https_2ca1config.toml
+++ b/integration/fixtures/https/clientca/https_2ca1config.toml
@ -15,8 +15,7 @@ defaultEntryPoints = ["https"]
      certFile = "fixtures/https/snitest.org.cert"
      keyFile = "fixtures/https/snitest.org.key"

-[web]
-  address = ":8080"
+[api]

 [file]

--- a/integration/fixtures/https/clientca/https_2ca2config.toml
+++ b/integration/fixtures/https/clientca/https_2ca2config.toml
@ -16,8 +16,7 @@ defaultEntryPoints = ["https"]
      certFile = "fixtures/https/snitest.org.cert"
      keyFile = "fixtures/https/snitest.org.key"

-[web]
-  address = ":8080"
+[api]

 [file]

--- a/integration/fixtures/https/dynamic_https_sni.toml
+++ b/integration/fixtures/https/dynamic_https_sni.toml
@ -10,8 +10,7 @@ defaultEntryPoints = ["https"]
  address = ":8443"
  [entryPoints.https02.tls]

-[web]
-  address = ":8080"
+[api]

 [file]

--- a/integration/fixtures/https/https_sni.toml
+++ b/integration/fixtures/https/https_sni.toml
@ -13,8 +13,7 @@ defaultEntryPoints = ["https"]
     certFile = "fixtures/https/snitest.org.cert"
     keyFile = "fixtures/https/snitest.org.key"

-[web]
-  address = ":8080"
+[api]

 [file]

--- a/integration/fixtures/https/rootcas/https.toml
+++ b/integration/fixtures/https/rootcas/https.toml
@ -24,8 +24,7 @@ fblo6RBxUQ==
  [entryPoints.http]
  address = ":8081"

-[web]
-  address = ":8080"
+[api]

 [file]

--- a/integration/fixtures/https/rootcas/https_with_file.toml
+++ b/integration/fixtures/https/rootcas/https_with_file.toml
@ -9,8 +9,7 @@ RootCAs =  [ "fixtures/https/rootcas/local.crt"]
  [entryPoints.http]
  address = ":8081"

-[web]
-  address = ":8080"
+[api]

 [file]

--- a/integration/fixtures/log_rotation_config.toml
+++ b/integration/fixtures/log_rotation_config.toml
@ -8,14 +8,16 @@ defaultEntryPoints = ["http"]
 [entryPoints]
  [entryPoints.http]
  address = ":8000"
+  [entryPoints.api]
+  address = ":7888"

 checkNewVersion = false

 ################################################################
-# Web configuration backend
+# Api configuration backend
 ################################################################
-[web]
-address = ":7888"
+[api]
+entryPoint = "api"

 ################################################################
 # File configuration backend
--- a/integration/fixtures/marathon/simple.toml
+++ b/integration/fixtures/marathon/simple.toml
@ -5,9 +5,11 @@ logLevel = "DEBUG"
 [entryPoints]
  [entryPoints.http]
  address = ":8000"
+[entryPoints.api]
+  address = ":9090"

-[web]
-address = ":9090"
+[api]
+  entryPoint = "api"

 [marathon]
  endpoint = "{{.MarathonURL}}"
--- a/integration/fixtures/proxy-protocol/with.toml
+++ b/integration/fixtures/proxy-protocol/with.toml
@ -7,8 +7,7 @@ address = ":8000"
 [entryPoints.http.proxyProtocol]
 trustedIPs = ["{{.HaproxyIP}}"]

-[web]
-address = ":8080"
+[api]

 [file]

--- a/integration/fixtures/proxy-protocol/without.toml
+++ b/integration/fixtures/proxy-protocol/without.toml
@ -7,8 +7,7 @@ address = ":8000"
 [entryPoints.http.proxyProtocol]
 trustedIPs = ["1.2.3.4"]

-[web]
-address = ":8080"
+[api]

 [file]

--- a/integration/fixtures/simple_web.toml
+++ b/integration/fixtures/simple_web.toml
@ -5,5 +5,4 @@ defaultEntryPoints = ["http"]
  [entryPoints.http]
  address = ":8000"

-[web]
-address = ":8080"
+[api]
--- a/integration/fixtures/timeout/forwarding_timeouts.toml
+++ b/integration/fixtures/timeout/forwarding_timeouts.toml
@ -8,8 +8,7 @@ defaultEntryPoints = ["http"]
 [accessLog]
 format = "json"

-[web]
-address = ":8080"
+[api]

 [forwardingTimeouts]
 dialTimeout = "300ms"
--- a/integration/fixtures/websocket/config.toml
+++ b/integration/fixtures/websocket/config.toml
@ -7,8 +7,7 @@ logLevel = "DEBUG"
  address = ":8000"


-[web]
-  address = ":8080"
+[api]

 [file]

--- a/integration/fixtures/websocket/config_https.toml
+++ b/integration/fixtures/websocket/config_https.toml
@ -11,8 +11,7 @@ InsecureSkipVerify=true
    certFile = "resources/tls/local.cert"
    keyFile = "resources/tls/local.key"

-[web]
-  address = ":8080"
+[api]

 [file]

--- a/integration/resources/compose/addprefix.yml
+++ b/integration/resources/compose/addprefix.yml
@ -0,0 +1,5 @@
+whoami1:
+  image: emilevauge/whoami
+  labels:
+    - traefik.enable=true
+    - traefik.frontend.rule=AddPrefix:/whoami;PathPrefix:/