diff --git a/api/dashboard.go b/api/dashboard.go index 64717b7dc..75b573597 100644 --- a/api/dashboard.go +++ b/api/dashboard.go @@ -15,7 +15,7 @@ type DashboardHandler struct{} func (g DashboardHandler) AddRoutes(router *mux.Router) { // Expose dashboard router.Methods(http.MethodGet).Path("/").HandlerFunc(func(response http.ResponseWriter, request *http.Request) { - http.Redirect(response, request, "/dashboard/", 302) + http.Redirect(response, request, request.Header.Get("X-Forwarded-Prefix")+"/dashboard/", 302) }) router.Methods(http.MethodGet).PathPrefix("/dashboard/"). Handler(http.StripPrefix("/dashboard/", http.FileServer(&assetfs.AssetFS{Asset: genstatic.Asset, AssetInfo: genstatic.AssetInfo, AssetDir: genstatic.AssetDir, Prefix: "static"}))) diff --git a/docs/basics.md b/docs/basics.md index 9a84281a4..5c30b78e4 100644 --- a/docs/basics.md +++ b/docs/basics.md @@ -632,8 +632,7 @@ Once a day (the first call begins 10 minutes after the start of Træfik), we col [entryPoints.http] address = ":80" -[web] - address = ":8080" +[api] [Docker] endpoint = "tcp://10.10.10.10:2375" @@ -663,8 +662,7 @@ Once a day (the first call begins 10 minutes after the start of Træfik), we col [entryPoints.http] address = ":80" -[web] - address = ":8080" +[api] [Docker] Endpoint = "xxxx" diff --git a/docs/configuration/api.md b/docs/configuration/api.md index 8c89644bf..ac6afd7dc 100644 --- a/docs/configuration/api.md +++ b/docs/configuration/api.md @@ -161,7 +161,7 @@ curl -s "http://localhost:8080/health" | jq . // average response time in seconds "average_response_time_sec": 0.8648016000000001, - // request statistics [requires --web.statistics to be set] + // request statistics [requires --statistics to be set] // ten most recent requests with 4xx and 5xx status codes "recent_errors": [ { diff --git a/docs/configuration/backends/web.md b/docs/configuration/backends/web.md index 93cce9676..d1363c2f5 100644 --- a/docs/configuration/backends/web.md +++ b/docs/configuration/backends/web.md @@ -35,6 +35,15 @@ address = ":8080" # Default: false # readOnly = true + + +# Set the root path for webui and API +# +# Deprecated +# Optional +# +# path = "/mypath" +# ``` ## Web UI @@ -375,3 +384,35 @@ curl -s "http://localhost:8080/api" | jq . } } ``` + +## Path + +As web is deprecated, you can handle the `Path` option like this + +```toml +[entrypoints.http] +address=":80" + +[entrypoints.dashboard] +address=":8080" + +[entrypoints.api] +address=":8081" + +#Activate API and Dashboard +[api] +entrypoint="api" + +[file] + [backends] + [backends.backend1] + [backends.backend1.servers.server1] + url = "http://127.0.0.1:8081" + + [frontends] + [frontends.frontend1] + entrypoints=["dashboard"] + backend = "backend1" + [frontends.frontend1.routes.test_1] + rule = "PathPrefixStrip:/yourprefix;PathPrefix:/yourprefix" +``` \ No newline at end of file diff --git a/docs/configuration/entrypoints.md b/docs/configuration/entrypoints.md index ab29a2142..5a6d73ca0 100644 --- a/docs/configuration/entrypoints.md +++ b/docs/configuration/entrypoints.md @@ -135,7 +135,7 @@ Users can be specified directly in the toml file, or indirectly by referencing a [entryPoints] [entryPoints.http] address = ":80" - [entryPoints.http.auth.basic] + [entryPoints.http.auth.digest] users = ["test:traefik:a2688e031edb4be6a3797f3882655c05 ", "test2:traefik:518845800f9e2bfb1f1f740ec24f074e"] usersFile = "/path/to/.htdigest" ``` diff --git a/docs/index.md b/docs/index.md index 4ff7d5dcf..53791bccd 100644 --- a/docs/index.md +++ b/docs/index.md @@ -108,7 +108,7 @@ version: '2' services: proxy: image: traefik - command: --web --docker --docker.domain=docker.localhost --logLevel=DEBUG + command: --api --docker --docker.domain=docker.localhost --logLevel=DEBUG networks: - webgateway ports: diff --git a/docs/user-guide/cluster-docker-consul.md b/docs/user-guide/cluster-docker-consul.md index 8b3f70c84..2bc3eb2df 100644 --- a/docs/user-guide/cluster-docker-consul.md +++ b/docs/user-guide/cluster-docker-consul.md @@ -90,7 +90,7 @@ services: traefik: image: traefik:1.5 command: - - "--web" + - "--api" - "--entrypoints=Name:http Address::80 Redirect.EntryPoint:https" - "--entrypoints=Name:https Address::443 TLS" - "--defaultentrypoints=http,https" @@ -155,7 +155,7 @@ The initializer in a docker-compose file will be: image: traefik:1.5 command: - "storeconfig" - - "--web" + - "--api" [...] - "--consul" - "--consul.endpoint=consul:8500" @@ -199,7 +199,7 @@ services: image: traefik:1.5 command: - "storeconfig" - - "--web" + - "--api" - "--entrypoints=Name:http Address::80 Redirect.EntryPoint:https" - "--entrypoints=Name:https Address::443 TLS" - "--defaultentrypoints=http,https" diff --git a/docs/user-guide/examples.md b/docs/user-guide/examples.md index 666b7c918..924e88dd6 100644 --- a/docs/user-guide/examples.md +++ b/docs/user-guide/examples.md @@ -306,7 +306,7 @@ idleTimeout = "360s" ## Securing Ping Health Check -The `/ping` health-check URL is enabled together with the web admin panel, enabled with the command-line `--web` or config file option `[web]`. +The `/ping` health-check URL is enabled with the command-line `--ping` or config file option `[ping]`. Thus, if you have a regular path for `/foo` and an entrypoint on `:80`, you would access them as follows: * Regular path: `http://hostname:80/foo` diff --git a/docs/user-guide/grpc.md b/docs/user-guide/grpc.md index f4f609d92..02c9531a8 100644 --- a/docs/user-guide/grpc.md +++ b/docs/user-guide/grpc.md @@ -57,8 +57,7 @@ RootCAs = [ "./backend.cert" ] keyFile = "./frontend.key" -[web] - address = ":8080" +[api] [file] diff --git a/docs/user-guide/kubernetes.md b/docs/user-guide/kubernetes.md index ea272da21..7ade57287 100644 --- a/docs/user-guide/kubernetes.md +++ b/docs/user-guide/kubernetes.md @@ -117,7 +117,7 @@ spec: - image: traefik name: traefik-ingress-lb args: - - --web + - --api - --kubernetes --- kind: Service @@ -182,7 +182,7 @@ spec: privileged: true args: - -d - - --web + - --api - --kubernetes --- kind: Service diff --git a/docs/user-guide/kv-config.md b/docs/user-guide/kv-config.md index 995e50ed2..d4aae8c97 100644 --- a/docs/user-guide/kv-config.md +++ b/docs/user-guide/kv-config.md @@ -70,10 +70,13 @@ logLevel = "DEBUG" defaultEntryPoints = ["http", "https"] [entryPoints] + [entryPoints.api] + address = ":8081" [entryPoints.http] address = ":80" [entryPoints.https] address = ":443" + [entryPoints.https.tls] [[entryPoints.https.tls.certificates]] certFile = "integration/fixtures/https/snitest.com.cert" @@ -94,8 +97,8 @@ defaultEntryPoints = ["http", "https"] watch = true prefix = "traefik" -[web] - address = ":8081" +[api] + entrypoint = "api" ``` And there, the same global configuration in the Key-value Store (using `prefix = "traefik"`): @@ -105,6 +108,7 @@ And there, the same global configuration in the Key-value Store (using `prefix = | `/traefik/loglevel` | `DEBUG` | | `/traefik/defaultentrypoints/0` | `http` | | `/traefik/defaultentrypoints/1` | `https` | +| `/traefik/entrypoints/api/address` | `:8081` | | `/traefik/entrypoints/http/address` | `:80` | | `/traefik/entrypoints/https/address` | `:443` | | `/traefik/entrypoints/https/tls/certificates/0/certfile` | `integration/fixtures/https/snitest.com.cert` | @@ -115,7 +119,7 @@ And there, the same global configuration in the Key-value Store (using `prefix = | `/traefik/consul/endpoint` | `127.0.0.1:8500` | | `/traefik/consul/watch` | `true` | | `/traefik/consul/prefix` | `traefik` | -| `/traefik/web/address` | `:8081` | +| `/traefik/api/entrypoint` | `api` | In case you are setting key values manually: diff --git a/docs/user-guide/swarm-mode.md b/docs/user-guide/swarm-mode.md index f9a4cc1f3..ac74036f7 100644 --- a/docs/user-guide/swarm-mode.md +++ b/docs/user-guide/swarm-mode.md @@ -90,7 +90,7 @@ docker-machine ssh manager "docker service create \ --docker.swarmmode \ --docker.domain=traefik \ --docker.watch \ - --web" + --api" ``` Let's explain this command: @@ -102,7 +102,7 @@ Let's explain this command: | `--mount type=bind,source=/var/run/docker.sock,target=/var/run/docker.sock` | we bind mount the docker socket where Træfik is scheduled to be able to speak to the daemon. | | `--network traefik-net` | we attach the Træfik service (and thus the underlying container) to the `traefik-net` network. | | `--docker` | enable docker backend, and `--docker.swarmmode` to enable the swarm mode on Træfik. | -| `--web` | activate the webUI on port 8080 | +| `--api | activate the webUI on port 8080 | ## Deploy your apps diff --git a/docs/user-guide/swarm.md b/docs/user-guide/swarm.md index 3d9c7df8c..0cf7296e1 100644 --- a/docs/user-guide/swarm.md +++ b/docs/user-guide/swarm.md @@ -93,7 +93,7 @@ docker $(docker-machine config mhs-demo0) run \ --docker.tls.key=/ssl/server-key.pem \ --docker.tls.insecureSkipVerify \ --docker.watch \ - --web + --api ``` Let's explain this command: @@ -107,7 +107,7 @@ Let's explain this command: | `--docker` | enable docker backend | | `--docker.endpoint=tcp://172.18.0.1:2376` | connect to the swarm master using the docker_gwbridge network | | `--docker.tls` | enable TLS using the docker-machine keys | -| `--web` | activate the webUI on port 8080 | +| `--api` | activate the webUI on port 8080 | ## Deploy your apps diff --git a/integration/consul_test.go b/integration/consul_test.go index 86fbadaab..112944dfb 100644 --- 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", } diff --git a/integration/etcd3_test.go b/integration/etcd3_test.go index df03bab12..1fce96a91 100644 --- 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", } diff --git a/integration/etcd_test.go b/integration/etcd_test.go index 29cc02498..d0470729a 100644 --- 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", } diff --git a/integration/fixtures/access_log_config.toml b/integration/fixtures/access_log_config.toml index ed49e68af..d263e3cfd 100644 --- 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 diff --git a/integration/fixtures/consul/simple.toml b/integration/fixtures/consul/simple.toml index e4bbb1a44..e6db89985 100644 --- 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" diff --git a/integration/fixtures/consul/simple_https.toml b/integration/fixtures/consul/simple_https.toml index 21326e66f..bc4b235cd 100644 --- 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" diff --git a/integration/fixtures/consul_catalog/simple.toml b/integration/fixtures/consul_catalog/simple.toml index 45bca454f..2912f2595 100644 --- 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] diff --git a/integration/fixtures/docker/simple.toml b/integration/fixtures/docker/simple.toml index 804c6f3cc..d0640b357 100644 --- 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] diff --git a/integration/fixtures/dynamodb/simple.toml b/integration/fixtures/dynamodb/simple.toml index 38c162f4f..cc8e2af75 100644 --- 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" diff --git a/integration/fixtures/etcd/simple.toml b/integration/fixtures/etcd/simple.toml index 7e43665e4..1b3c333c8 100644 --- 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" \ No newline at end of file diff --git a/integration/fixtures/etcd/simple_https.toml b/integration/fixtures/etcd/simple_https.toml index b5d93290d..c964da3d9 100644 --- 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" \ No newline at end of file diff --git a/integration/fixtures/eureka/simple.toml b/integration/fixtures/eureka/simple.toml index 8a9ffd94c..e026549ce 100644 --- 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] diff --git a/integration/fixtures/grpc/config.toml b/integration/fixtures/grpc/config.toml index 4a37aa80f..fa5231b6f 100644 --- 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] diff --git a/integration/fixtures/grpc/config_insecure.toml b/integration/fixtures/grpc/config_insecure.toml index 524ab20b7..bffc3d50d 100644 --- 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] diff --git a/integration/fixtures/healthcheck/multiple-entrypoints-drr.toml b/integration/fixtures/healthcheck/multiple-entrypoints-drr.toml index 7ebf72621..4489c5749 100644 --- 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] diff --git a/integration/fixtures/healthcheck/multiple-entrypoints-wrr.toml b/integration/fixtures/healthcheck/multiple-entrypoints-wrr.toml index c6e4ddfe7..beb8bdb55 100644 --- 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] diff --git a/integration/fixtures/healthcheck/port_overload.toml b/integration/fixtures/healthcheck/port_overload.toml index b3c76db6c..3619988b6 100644 --- 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] diff --git a/integration/fixtures/healthcheck/simple.toml b/integration/fixtures/healthcheck/simple.toml index 7cdf9c4a8..b28cce1b3 100644 --- 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] diff --git a/integration/fixtures/https/clientca/https_1ca1config.toml b/integration/fixtures/https/clientca/https_1ca1config.toml index 320796be1..c85f4cd95 100644 --- 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] diff --git a/integration/fixtures/https/clientca/https_2ca1config.toml b/integration/fixtures/https/clientca/https_2ca1config.toml index 741554de7..5b8c92617 100644 --- 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] diff --git a/integration/fixtures/https/clientca/https_2ca2config.toml b/integration/fixtures/https/clientca/https_2ca2config.toml index fe904e245..4e3dff814 100644 --- 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] diff --git a/integration/fixtures/https/dynamic_https_sni.toml b/integration/fixtures/https/dynamic_https_sni.toml index 3c5b84da4..d7a023e6d 100644 --- 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] diff --git a/integration/fixtures/https/https_sni.toml b/integration/fixtures/https/https_sni.toml index 855a69ba3..fc0b86a13 100644 --- 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] diff --git a/integration/fixtures/https/rootcas/https.toml b/integration/fixtures/https/rootcas/https.toml index 8466b2f57..07e3b6203 100644 --- 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] diff --git a/integration/fixtures/https/rootcas/https_with_file.toml b/integration/fixtures/https/rootcas/https_with_file.toml index a95571a36..c0815c37f 100644 --- 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] diff --git a/integration/fixtures/log_rotation_config.toml b/integration/fixtures/log_rotation_config.toml index a77392f30..78a21d9e2 100644 --- 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 diff --git a/integration/fixtures/marathon/simple.toml b/integration/fixtures/marathon/simple.toml index c388ec5b9..f737e7d38 100644 --- 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}}" diff --git a/integration/fixtures/proxy-protocol/with.toml b/integration/fixtures/proxy-protocol/with.toml index 68f813994..5520e9f30 100644 --- 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] diff --git a/integration/fixtures/proxy-protocol/without.toml b/integration/fixtures/proxy-protocol/without.toml index 3188c64f7..40d7f7902 100644 --- 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] diff --git a/integration/fixtures/simple_web.toml b/integration/fixtures/simple_web.toml index b05590cf2..55b88480e 100644 --- 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] diff --git a/integration/fixtures/timeout/forwarding_timeouts.toml b/integration/fixtures/timeout/forwarding_timeouts.toml index 78c3d098a..97893ab59 100644 --- 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" diff --git a/integration/fixtures/websocket/config.toml b/integration/fixtures/websocket/config.toml index e65a6f80a..6650a1bf5 100644 --- 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] diff --git a/integration/fixtures/websocket/config_https.toml b/integration/fixtures/websocket/config_https.toml index 73ef23f2c..21c40a473 100644 --- 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] diff --git a/integration/resources/compose/addprefix.yml b/integration/resources/compose/addprefix.yml new file mode 100644 index 000000000..4b6f328d9 --- /dev/null +++ b/integration/resources/compose/addprefix.yml @@ -0,0 +1,5 @@ +whoami1: + image: emilevauge/whoami + labels: + - traefik.enable=true + - traefik.frontend.rule=AddPrefix:/whoami;PathPrefix:/