Merge pull request #112 from bennyhansson/master

Add passHostHeader to kv frontend definition.
Add passHostHeader to frontend definition.
2015-11-17 16:28:59 +01:00 · 2015-11-16 22:51:52 +01:00 · 2015-11-13 09:35:14 +01:00 · 2015-11-12 17:04:19 -07:00
2 changed files with 4 additions and 0 deletions
--- a/provider/docker.go
+++ b/provider/docker.go
@@ -209,6 +209,9 @@ func (provider *Docker) loadDockerConfig(dockerClient *docker.Client) *types.Con
 func (provider *Docker) getFrontendName(container docker.Container) string {
 	// Replace '.' with '-' in quoted keys because of this issue https://github.com/BurntSushi/toml/issues/78
 	frontendName := fmt.Sprintf("%s-%s", provider.GetFrontendRule(container), provider.GetFrontendValue(container))
+	frontendName = strings.Replace(frontendName, "[", "", -1)
+	frontendName = strings.Replace(frontendName, "]", "", -1)
+
 	return strings.Replace(frontendName, ".", "-", -1)
 }

--- a/templates/kv.tmpl
+++ b/templates/kv.tmpl
@@ -28,6 +28,7 @@
    {{$frontend := Last .}}
    [frontends.{{$frontend}}]
    backend = "{{Get . "/backend"}}"
+    passHostHeader = "{{Get . "/passHostHeader"}}"
    {{$routes := List . "/routes/"}}
        {{range $routes}}
        [frontends.{{$frontend}}.routes.{{Last .}}]
Author	SHA1	Message	Date
Vincent Demeester	3f905ee7d0	Merge pull request #112 from bennyhansson/master Add passHostHeader to kv frontend definition.	2015-11-17 16:28:59 +01:00
Benny Hansson	e90cb6b53b	Add passHostHeader to frontend definition.	2015-11-16 22:51:52 +01:00
Vincent Demeester	400655f212	Merge pull request #109 from polds/docker/clean-frontend Replace [ and ] in frontend names	2015-11-13 09:35:14 +01:00
Peter Olds	481a4b2096	Replace [ and ] in frontend names Signed-off-by: Peter Olds <polds@kyanicorp.com>	2015-11-12 17:04:19 -07:00