diff --git a/README.md b/README.md index 965261222..f4c74ee9b 100644 --- a/README.md +++ b/README.md @@ -133,7 +133,7 @@ git clone https://github.com/containous/traefik ## Introductory Videos -Here is a talk given by [Emile Vauge](https://github.com/emilevauge) at [GopherCon 2017](https://gophercon.com/). +Here is a talk given by [Emile Vauge](https://github.com/emilevauge) at GopherCon 2017. You will learn Traefik basics in less than 10 minutes. [![Traefik GopherCon 2017](https://img.youtube.com/vi/RgudiksfL-k/0.jpg)](https://www.youtube.com/watch?v=RgudiksfL-k) diff --git a/docs/basics.md b/docs/basics.md index 9dd553076..c9c792cf9 100644 --- a/docs/basics.md +++ b/docs/basics.md @@ -746,8 +746,6 @@ If you want to dig into more details, here is the source code of the collecting By default we anonymize all configuration fields, except fields tagged with `export=true`. -You can check all fields in the [godoc](https://godoc.org/github.com/containous/traefik/configuration#GlobalConfiguration). - ### How to enable this ? You can enable the collecting system by: diff --git a/docs/configuration/acme.md b/docs/configuration/acme.md index c766054ce..e25ef3882 100644 --- a/docs/configuration/acme.md +++ b/docs/configuration/acme.md @@ -285,7 +285,7 @@ Here is a list of supported `provider`s, that can automate the DNS verification, | [DigitalOcean](https://www.digitalocean.com) | `digitalocean` | `DO_AUTH_TOKEN` | YES | | [DNSimple](https://dnsimple.com) | `dnsimple` | `DNSIMPLE_OAUTH_TOKEN`, `DNSIMPLE_BASE_URL` | Not tested yet | | [DNS Made Easy](https://dnsmadeeasy.com) | `dnsmadeeasy` | `DNSMADEEASY_API_KEY`, `DNSMADEEASY_API_SECRET`, `DNSMADEEASY_SANDBOX` | Not tested yet | -| [DNSPod](http://www.dnspod.net/) | `dnspod` | `DNSPOD_API_KEY` | Not tested yet | +| [DNSPod](https://www.dnspod.com/) | `dnspod` | `DNSPOD_API_KEY` | Not tested yet | | [DreamHost](https://www.dreamhost.com/) | `dreamhost` | `DREAMHOST_API_KEY` | YES | | [Duck DNS](https://www.duckdns.org/) | `duckdns` | `DUCKDNS_TOKEN` | No | | [Dyn](https://dyn.com) | `dyn` | `DYN_CUSTOMER_NAME`, `DYN_USER_NAME`, `DYN_PASSWORD` | Not tested yet | diff --git a/docs/configuration/backends/kubernetes.md b/docs/configuration/backends/kubernetes.md index b80e12ac9..5ee509c2e 100644 --- a/docs/configuration/backends/kubernetes.md +++ b/docs/configuration/backends/kubernetes.md @@ -128,10 +128,11 @@ This will give more flexibility in cloud/dynamic environments. Traefik automatically requests endpoint information based on the service provided in the ingress spec. Although traefik will connect directly to the endpoints (pods), it still checks the service port to see if TLS communication is required. -There are 2 ways to configure Traefik to use https to communicate with backend pods: +There are 3 ways to configure Traefik to use https to communicate with backend pods: 1. If the service port defined in the ingress spec is 443 (note that you can still use `targetPort` to use a different port on your pod). 2. If the service port defined in the ingress spec has a name that starts with `https` (such as `https-api`, `https-web` or just `https`). +3. If the ingress spec includes the annotation `ingress.kubernetes.io/protocol: https`. If either of those configuration options exist, then the backend communication protocol is assumed to be TLS, and will connect via TLS automatically. @@ -166,7 +167,7 @@ The following general annotations are applicable on the Ingress object: | `traefik.ingress.kubernetes.io/service-weights: ` | Set ingress backend weights specified as percentage or decimal numbers in YAML. (6) | | `traefik.ingress.kubernetes.io/whitelist-source-range: "1.2.3.0/24, fe80::/16"` | A comma-separated list of IP ranges permitted for access (7). | | `ingress.kubernetes.io/whitelist-x-forwarded-for: "true"` | Use `X-Forwarded-For` header as valid source of IP for the white list. | -| `ingress.kubernetes.io/protocol: ` | Set the protocol Traefik will use to communicate with pods. | +| `ingress.kubernetes.io/protocol:` | Set the protocol Traefik will use to communicate with pods. Acceptable protocols: http,https,h2c | <1> `traefik.ingress.kubernetes.io/app-root`: Non-root paths will not be affected by this annotation and handled normally. diff --git a/docs/index.md b/docs/index.md index 4f606be86..9fb64ceaa 100644 --- a/docs/index.md +++ b/docs/index.md @@ -176,7 +176,7 @@ Our recommendation would be to see for yourself how simple it is to enable HTTPS ## Resources -Here is a talk given by [Emile Vauge](https://github.com/emilevauge) at [GopherCon 2017](https://gophercon.com). +Here is a talk given by [Emile Vauge](https://github.com/emilevauge) at GopherCon 2017. You will learn Traefik basics in less than 10 minutes. [![Traefik GopherCon 2017](https://img.youtube.com/vi/RgudiksfL-k/0.jpg)](https://www.youtube.com/watch?v=RgudiksfL-k)