From 61d54903e3d76a6d0ceae174b96e0426adfc1e8c Mon Sep 17 00:00:00 2001 From: Emile Vauge Date: Wed, 13 Apr 2016 21:12:49 +0200 Subject: [PATCH] Fix doc Signed-off-by: Emile Vauge --- docs/benchmarks.md | 1 + docs/toml.md | 7 ++++--- glide.lock | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/docs/benchmarks.md b/docs/benchmarks.md index fae8bd786..008f0e378 100644 --- a/docs/benchmarks.md +++ b/docs/benchmarks.md @@ -207,6 +207,7 @@ Traefik is obviously slower than Nginx, but not so much: Traefik can serve 28392 Not bad for young project :) ! Some areas of possible improvements: + - Use [GO_REUSEPORT](https://github.com/kavu/go_reuseport) listener - Run a separate server instance per CPU core with `GOMAXPROCS=1` (it appears during benchmarks that there is a lot more context switches with traefik than with nginx) diff --git a/docs/toml.md b/docs/toml.md index d8334c7da..8fc0c233b 100644 --- a/docs/toml.md +++ b/docs/toml.md @@ -518,7 +518,7 @@ Labels can be used on containers to override default behaviour: - `traefik.protocol=https`: override the default `http` protocol - `traefik.weight=10`: assign this weight to the container - `traefik.enable=false`: disable this container in Træfɪk -- `traefik.frontend.rule=Host:test.traefik.io`: override the default frontend rule (Default: `Host:{containerName}.{domain}`). See [frontends](#frontends). +- `traefik.frontend.rule=Host:test.traefik.io`: override the default frontend rule (Default: `Host:{containerName}.{domain}`). - `traefik.frontend.passHostHeader=true`: forward client `Host` header to the backend. - `traefik.frontend.entryPoints=http,https`: assign this frontend to entry points `http` and `https`. Overrides `defaultEntryPoints`. * `traefik.domain=traefik.localhost`: override the default domain @@ -598,7 +598,7 @@ Labels can be used on containers to override default behaviour: - `traefik.protocol=https`: override the default `http` protocol - `traefik.weight=10`: assign this weight to the application - `traefik.enable=false`: disable this application in Træfɪk -- `traefik.frontend.rule=Host:test.traefik.io`: override the default frontend rule (Default: `Host:{containerName}.{domain}`). See [frontends](#frontends). +- `traefik.frontend.rule=Host:test.traefik.io`: override the default frontend rule (Default: `Host:{containerName}.{domain}`). - `traefik.frontend.passHostHeader=true`: forward client `Host` header to the backend. - `traefik.frontend.entryPoints=http,https`: assign this frontend to entry points `http` and `https`. Overrides `defaultEntryPoints`. * `traefik.domain=traefik.localhost`: override the default domain @@ -693,12 +693,13 @@ This backend will create routes matching on hostname based on the service name used in consul. Additional settings can be defined using Consul Catalog tags: + - ```traefik.enable=false```: disable this container in Træfɪk - ```traefik.protocol=https```: override the default `http` protocol - ```traefik.backend.weight=10```: assign this weight to the container - ```traefik.backend.circuitbreaker=NetworkErrorRatio() > 0.5``` - ```traefik.backend.loadbalancer=drr```: override the default load balancing mode -- ```traefik.frontend.rule=Host:test.traefik.io```: override the default frontend rule (Default: `Host:{containerName}.{domain}`). See [frontends](#frontends). +- ```traefik.frontend.rule=Host:test.traefik.io```: override the default frontend rule (Default: `Host:{containerName}.{domain}`). - ```traefik.frontend.passHostHeader=true```: forward client `Host` header to the backend. - ```traefik.frontend.entryPoints=http,https```: assign this frontend to entry points `http` and `https`. Overrides `defaultEntryPoints`. diff --git a/glide.lock b/glide.lock index 9b10d0ddc..48df05ac2 100644 --- a/glide.lock +++ b/glide.lock @@ -83,7 +83,7 @@ imports: - utils - volume - name: github.com/docker/engine-api - version: 87b3df23dcba0ce02bfe0474e29a08a97f7814e6 + version: 8924d6900370b4c7e7984be5adc61f50a80d7537 subpackages: - client - types