From ffe69c67fc65e6e97878fcf73ffd29fe262b9f65 Mon Sep 17 00:00:00 2001 From: Ludovic Fernandez Date: Mon, 27 May 2019 18:02:06 +0200 Subject: [PATCH] Entry points CLI description. --- docs/content/reference/static-configuration.txt | 5 ++--- pkg/config/static/static_config.go | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/docs/content/reference/static-configuration.txt b/docs/content/reference/static-configuration.txt index 4a69101be..ea9c1afe9 100644 --- a/docs/content/reference/static-configuration.txt +++ b/docs/content/reference/static-configuration.txt @@ -41,9 +41,8 @@ --api.statistics Enable more detailed statistics (default "true") --api.statistics.recenterrors Number of recent errors logged (default "10") -c, --configfile Configuration file to use (TOML). ---entrypoints Entrypoints definition using format: --entryPoints='Name:http Address::8000 (default "map[]") - Redirect.EntryPoint:https' --entryPoints='Name:https Address::4442 - TLS:tests/traefik.crt,tests/traefik.key;prod/traefik.crt,prod/traefik.key' +--entrypoints Entrypoints definition using format: --entryPoints='Name:http Address::8000' (default "map[]") + --entryPoints='Name:https Address::4442' --global Global configuration options (default "true") --global.checknewversion Periodically check if a new version has been released (default "true") -d, --global.debug Enable debug mode (default "false") diff --git a/pkg/config/static/static_config.go b/pkg/config/static/static_config.go index b993b1d24..0d0cdc640 100644 --- a/pkg/config/static/static_config.go +++ b/pkg/config/static/static_config.go @@ -48,7 +48,7 @@ type Configuration struct { Global *Global `description:"Global configuration options" export:"true"` ServersTransport *ServersTransport `description:"Servers default transport" export:"true"` - EntryPoints EntryPoints `description:"Entrypoints definition using format: --entryPoints='Name:http Address::8000 Redirect.EntryPoint:https' --entryPoints='Name:https Address::4442 TLS:tests/traefik.crt,tests/traefik.key;prod/traefik.crt,prod/traefik.key'" export:"true"` + EntryPoints EntryPoints `description:"Entry points definition using format: --entryPoints='Name:http Address::8000' --entryPoints='Name:https Address::4442'" export:"true"` Providers *Providers `description:"Providers configuration" export:"true"` API *API `description:"Enable api/dashboard" export:"true"`