Merge pull request #817 from gomes/master

Marathon ExposedByDefault is true by default
This commit is contained in:
Emile Vauge 2016-11-10 11:34:00 +01:00 committed by GitHub
commit acf425b6cf
2 changed files with 12 additions and 12 deletions

View file

@ -793,7 +793,7 @@ domain = "marathon.localhost"
# Expose Marathon apps by default in traefik # Expose Marathon apps by default in traefik
# #
# Optional # Optional
# Default: false # Default: true
# #
# exposedByDefault = true # exposedByDefault = true

View file

@ -425,12 +425,12 @@
# key = "/etc/ssl/docker.key" # key = "/etc/ssl/docker.key"
# insecureskipverify = true # insecureskipverify = true
# Constraints # Constraints
# #
# Optional # Optional
# #
# constraints = ["tag==api", "tag==he*ld"] # constraints = ["tag==api", "tag==he*ld"]
# Matching with containers having the label "traefik.tags" set to "api,helloworld" # Matching with containers having the label "traefik.tags" set to "api,helloworld"
# ex: $ docker run -d -P --label traefik.tags=api,helloworld emilevauge/whoami # ex: $ docker run -d -P --label traefik.tags=api,helloworld emilevauge/whoami
@ -474,7 +474,7 @@
# Expose Marathon apps by default in traefik # Expose Marathon apps by default in traefik
# #
# Optional # Optional
# Default: false # Default: true
# #
# exposedByDefault = true # exposedByDefault = true
@ -676,10 +676,10 @@
# prefix = "traefik" # prefix = "traefik"
# Constraints # Constraints
# #
# Optional # Optional
# #
# constraints = ["tag==api", "tag==he*ld"] # constraints = ["tag==api", "tag==he*ld"]
# Matching with containers having this tag: "traefik.tags=api,helloworld" # Matching with containers having this tag: "traefik.tags=api,helloworld"
################################################################ ################################################################