From 4a96f192211017381ce9f8bf6fe1a5915a0c27d3 Mon Sep 17 00:00:00 2001 From: emile Date: Wed, 9 Sep 2015 17:50:02 +0200 Subject: [PATCH] Added configurations --- docker.go | 5 +++-- træfik.go | 3 ++- træfik.toml | 3 +++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/docker.go b/docker.go index 80f3cec79..59eff4fed 100644 --- a/docker.go +++ b/docker.go @@ -34,6 +34,7 @@ type DockerProvider struct { Watch bool Endpoint string dockerClient *docker.Client + Filename string Domain string } @@ -72,14 +73,14 @@ func (provider *DockerProvider) loadDockerConfig() *Configuration { templateObjects := struct { Containers []docker.Container Hosts map[string][]docker.Container - Domain string + Domain string }{ containersInspected, hosts, provider.Domain, } gtf.Inject(DockerFuncMap) - tmpl, err := template.New("docker.tmpl").Funcs(DockerFuncMap).ParseFiles("docker.tmpl") + tmpl, err := template.New(provider.Filename).Funcs(DockerFuncMap).ParseFiles(provider.Filename) if err != nil { log.Println("Error reading file:", err) return nil diff --git a/træfik.go b/træfik.go index d5ed8b991..934e29201 100644 --- a/træfik.go +++ b/træfik.go @@ -19,6 +19,7 @@ import ( ) type FileConfiguration struct { + Port string Docker *DockerProvider File *FileProvider Web *WebProvider @@ -98,7 +99,7 @@ func main() { }, Server: &http.Server{ - Addr: ":8001", + Addr: configuration.Port, Handler: configurationRouter, }, } diff --git a/træfik.toml b/træfik.toml index ec0d004dc..2a8ed0cc8 100644 --- a/træfik.toml +++ b/træfik.toml @@ -1,7 +1,10 @@ +port = ":8001" + [docker] endpoint = "unix:///var/run/docker.sock" watch = true domain = "toto.fr" +filename = "docker.tmpl" [web] address = ":8010"