diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a49855a1..70308aef1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ # Change Log +## [v1.4.5](https://github.com/containous/traefik/tree/v1.4.5) (2017-12-05) +[All Commits](https://github.com/containous/traefik/compare/v1.4.4...v1.4.5) + +**Bug fixes:** +- **[docker]** Fix empty ip when container is stopped ([#2478](https://github.com/containous/traefik/pull/2478) by [mmatur](https://github.com/mmatur)) +- **[k8s]** Fix kubernetes path prefix rule with rewrite-target ([#2461](https://github.com/containous/traefik/pull/2461) by [cheungpat](https://github.com/cheungpat)) + +**Documentation:** +- **[file]** Emphasize the necessity of enabling file backend ([#2483](https://github.com/containous/traefik/pull/2483) by [mvasin](https://github.com/mvasin)) +- Add link to future 1.5 documentation. ([#2477](https://github.com/containous/traefik/pull/2477) by [ldez](https://github.com/ldez)) + ## [v1.5.0-rc1](https://github.com/containous/traefik/tree/v1.5.0-rc1) (2017-11-28) [All Commits](https://github.com/containous/traefik/compare/v1.4.0-rc1...v1.5.0-rc1) diff --git a/docs/configuration/backends/file.md b/docs/configuration/backends/file.md index ff77385ed..2621a5695 100644 --- a/docs/configuration/backends/file.md +++ b/docs/configuration/backends/file.md @@ -8,6 +8,8 @@ You have three choices: - [Rules in a Separate File](/configuration/backends/file/#rules-in-a-separate-file) - [Multiple `.toml` Files](/configuration/backends/file/#multiple-toml-files) +To enable the file backend, you must either pass the `--file` option to the Træfik binary or put the `[file]` section (with or without inner settings) in the configuration file. + The configuration file allows managing both backends/frontends and HTTPS certificates (which are not [Let's Encrypt](https://letsencrypt.org) certificates generated through Træfik). ## Simple @@ -25,8 +27,8 @@ defaultEntryPoints = ["http", "https"] [entryPoints.https] address = ":443" [entryPoints.https.tls] - [[entryPoints.https.tls.certificates]] - certFile = "integration/fixtures/https/snitest.org.cert" + [[entryPoints.https.tls.certificates]] + certFile = "integration/fixtures/https/snitest.org.cert" keyFile = "integration/fixtures/https/snitest.org.key" [file] @@ -153,15 +155,16 @@ filename = "rules.toml" entrypoints = ["http", "https"] # overrides defaultEntryPoints backend = "backend2" rule = "Path:/test" + # HTTPS certificate [[tlsConfiguration]] -entryPoints = ["https"] + entryPoints = ["https"] [tlsConfiguration.certificate] certFile = "integration/fixtures/https/snitest.com.cert" keyFile = "integration/fixtures/https/snitest.com.key" [[tlsConfiguration]] -entryPoints = ["https"] + entryPoints = ["https"] [[tlsConfiguration.certificates]] certFile = "integration/fixtures/https/snitest.org.cert" keyFile = "integration/fixtures/https/snitest.org.key"