1
0
Fork 0

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Marcus Stong 2016-05-02 11:44:07 -04:00
commit 52bff85dda
50 changed files with 2677 additions and 291 deletions

View file

@ -90,7 +90,7 @@
# regex = "^http://localhost/(.*)"
# replacement = "http://mydomain/$1"
entryPoints]
[entryPoints]
[entryPoints.http]
address = ":80"
```
@ -265,7 +265,7 @@ defaultEntryPoints = ["http", "https"]
rule = "Path:/test"
```
- or put your rules in a separate file, for example `rules.tml`:
- or put your rules in a separate file, for example `rules.toml`:
```toml
# traefik.toml
@ -621,6 +621,37 @@ Labels can be used on containers to override default behaviour:
- `traefik.frontend.entryPoints=http,https`: assign this frontend to entry points `http` and `https`. Overrides `defaultEntryPoints`.
* `traefik.domain=traefik.localhost`: override the default domain
## Kubernetes Ingress backend
Træfɪk can be configured to use Kubernetes Ingress as a backend configuration:
```toml
################################################################
# Kubernetes Ingress configuration backend
################################################################
# Enable Kubernetes Ingress configuration backend
#
# Optional
#
[kubernetes]
# Kubernetes server endpoint
#
# When deployed as a replication controller in Kubernetes,
# Traefik will use env variable KUBERNETES_SERVICE_HOST
# and KUBERNETES_SERVICE_PORT_HTTPS as endpoint
# Secure token will be found in /var/run/secrets/kubernetes.io/serviceaccount/token
# and SSL CA cert in /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
#
# Optional
#
# endpoint = "http://localhost:8080"
```
You can find here an example [ingress](https://raw.githubusercontent.com/containous/traefik/master/examples/k8s.ingress.yaml) and [replication controller](https://raw.githubusercontent.com/containous/traefik/master/examples/k8s.rc.yaml).
## Consul backend
Træfɪk can be configured to use Consul as a backend configuration: