From e2d2f1f1d18d85d8ae08b5271c3b5cca36243610 Mon Sep 17 00:00:00 2001 From: emile Date: Thu, 10 Sep 2015 16:46:27 +0200 Subject: [PATCH] Traefik --- ROADMAP.md | 8 +- docker.go | 8 +- marathon.go | 4 +- templates/configuration.tmpl | 6 +- templates/notFound.tmpl | 2 +- træfik.toml => traefik.toml | 0 træfik.go | 172 ----------------------------------- 7 files changed, 14 insertions(+), 186 deletions(-) rename træfik.toml => traefik.toml (100%) delete mode 100644 træfik.go diff --git a/ROADMAP.md b/ROADMAP.md index 11601e918..2dbc6f0cc 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -1,10 +1,9 @@ * Default configuration values * Godoc -* Weights * Licence * Filter no exposed port apps -* Filter træfik.enabled=false apps -* Add træfik.indlude all/enabled policy +* Filter traefik.enabled=false apps +* Add traefik.indlude all/enabled policy * SSL frontend support * SSL backends support * Etcd support @@ -14,4 +13,5 @@ * README -* ~~GraceTimeout~~ \ No newline at end of file +* ~~GraceTimeout~~ +* ~~Weights~~ diff --git a/docker.go b/docker.go index 67ef12d7b..ae2d5903c 100644 --- a/docker.go +++ b/docker.go @@ -20,7 +20,7 @@ type DockerProvider struct { var DockerFuncMap = template.FuncMap{ "getBackend": func(container docker.Container) string { for key, value := range container.Config.Labels { - if (key == "træfik.backend") { + if (key == "traefik.backend") { return value } } @@ -28,7 +28,7 @@ var DockerFuncMap = template.FuncMap{ }, "getPort": func(container docker.Container) string { for key, value := range container.Config.Labels { - if (key == "træfik.port") { + if (key == "traefik.port") { return value } } @@ -39,7 +39,7 @@ var DockerFuncMap = template.FuncMap{ }, "getWeight": func(container docker.Container) string { for key, value := range container.Config.Labels { - if (key == "træfik.weight") { + if (key == "traefik.weight") { return value } } @@ -120,7 +120,7 @@ func (provider *DockerProvider) loadDockerConfig() *Configuration { func getHost(container docker.Container) string { for key, value := range container.Config.Labels { - if (key == "træfik.host") { + if (key == "traefik.host") { return value } } diff --git a/marathon.go b/marathon.go index bf3ade064..4c1db8b5d 100644 --- a/marathon.go +++ b/marathon.go @@ -28,7 +28,7 @@ var MarathonFuncMap = template.FuncMap{ }, "getHost": func(application marathon.Application) string { for key, value := range application.Labels { - if (key == "træfik.host") { + if (key == "traefik.host") { return value } } @@ -36,7 +36,7 @@ var MarathonFuncMap = template.FuncMap{ }, "getWeight": func(application marathon.Application) string { for key, value := range application.Labels { - if (key == "træfik.weight") { + if (key == "traefik.weight") { return value } } diff --git a/templates/configuration.tmpl b/templates/configuration.tmpl index 033760f3b..3761541d1 100644 --- a/templates/configuration.tmpl +++ b/templates/configuration.tmpl @@ -1,7 +1,7 @@ - træfik + Traefik @@ -18,7 +18,7 @@