No template parsing on traefik configuration file

provider/file/file.go

@@ -14,6 +14,7 @@ import (
 	"github.com/containous/traefik/safe"
 	"github.com/containous/traefik/tls"
 	"github.com/containous/traefik/types"
+	"github.com/pkg/errors"
 	"gopkg.in/fsnotify.v1"
 )
 
@@ -23,6 +24,7 @@ var _ provider.Provider = (*Provider)(nil)
 type Provider struct {
 	provider.BaseProvider `mapstructure:",squash" export:"true"`
 	Directory             string `description:"Load configuration from one or more .toml files in a directory" export:"true"`
+	TraefikFile           string
 }
 
 // Provide allows the file provider to provide configurations to traefik
@@ -37,10 +39,12 @@ func (p *Provider) Provide(configurationChan chan<- types.ConfigMessage, pool *s
 	if p.Watch {
 		var watchItem string
 
-		if p.Directory != "" {
+		if len(p.Directory) > 0 {
 			watchItem = p.Directory
-		} else {
+		} else if len(p.Filename) > 0 {
 			watchItem = filepath.Dir(p.Filename)
+		} else {
+			watchItem = filepath.Dir(p.TraefikFile)
 		}
 
 		if err := p.addWatcher(pool, watchItem, configurationChan, p.watcherCallback); err != nil {
@@ -55,10 +59,19 @@ func (p *Provider) Provide(configurationChan chan<- types.ConfigMessage, pool *s
 // BuildConfiguration loads configuration either from file or a directory specified by 'Filename'/'Directory'
 // and returns a 'Configuration' object
 func (p *Provider) BuildConfiguration() (*types.Configuration, error) {
-	if p.Directory != "" {
+	if len(p.Directory) > 0 {
 		return p.loadFileConfigFromDirectory(p.Directory, nil)
 	}
-	return p.loadFileConfig(p.Filename)
+
+	if len(p.Filename) > 0 {
+		return p.loadFileConfig(p.Filename, true)
+	}
+
+	if len(p.TraefikFile) > 0 {
+		return p.loadFileConfig(p.TraefikFile, false)
+	}
+
+	return nil, errors.New("Error using file configuration backend, no filename defined")
 }
 
 func (p *Provider) addWatcher(pool *safe.Pool, directory string, configurationChan chan<- types.ConfigMessage, callback func(chan<- types.ConfigMessage, fsnotify.Event)) error {
@@ -67,6 +80,11 @@ func (p *Provider) addWatcher(pool *safe.Pool, directory string, configurationCh
 		return fmt.Errorf("error creating file watcher: %s", err)
 	}
 
+	err = watcher.Add(directory)
+	if err != nil {
+		return fmt.Errorf("error adding file watcher: %s", err)
+	}
+
 	// Process events
 	pool.Go(func(stop chan bool) {
 		defer watcher.Close()
@@ -76,8 +94,15 @@ func (p *Provider) addWatcher(pool *safe.Pool, directory string, configurationCh
 				return
 			case evt := <-watcher.Events:
 				if p.Directory == "" {
+					var filename string
+					if len(p.Filename) > 0 {
+						filename = p.Filename
+					} else {
+						filename = p.TraefikFile
+					}
+
 					_, evtFileName := filepath.Split(evt.Name)
-					_, confFileName := filepath.Split(p.Filename)
+					_, confFileName := filepath.Split(filename)
 					if evtFileName == confFileName {
 						callback(configurationChan, evt)
 					}
@@ -89,18 +114,15 @@ func (p *Provider) addWatcher(pool *safe.Pool, directory string, configurationCh
 			}
 		}
 	})
-	err = watcher.Add(directory)
-	if err != nil {
-		return fmt.Errorf("error adding file watcher: %s", err)
-	}
-
 	return nil
 }
 
 func (p *Provider) watcherCallback(configurationChan chan<- types.ConfigMessage, event fsnotify.Event) {
-	watchItem := p.Filename
-	if p.Directory != "" {
+	watchItem := p.TraefikFile
+	if len(p.Directory) > 0 {
 		watchItem = p.Directory
+	} else if len(p.Filename) > 0 {
+		watchItem = p.Filename
 	}
 
 	if _, err := os.Stat(watchItem); err != nil {
@@ -136,12 +158,19 @@ func readFile(filename string) (string, error) {
 	return "", fmt.Errorf("invalid filename: %s", filename)
 }
 
-func (p *Provider) loadFileConfig(filename string) (*types.Configuration, error) {
+func (p *Provider) loadFileConfig(filename string, parseTemplate bool) (*types.Configuration, error) {
 	fileContent, err := readFile(filename)
 	if err != nil {
 		return nil, fmt.Errorf("error reading configuration file: %s - %s", filename, err)
 	}
-	configuration, err := p.CreateConfiguration(fileContent, template.FuncMap{}, false)
+
+	var configuration *types.Configuration
+	if parseTemplate {
+		configuration, err = p.CreateConfiguration(fileContent, template.FuncMap{}, false)
+	} else {
+		configuration, err = p.DecodeConfiguration(fileContent)
+	}
+
 	if err != nil {
 		return nil, err
 	}
@@ -182,7 +211,7 @@ func (p *Provider) loadFileConfigFromDirectory(directory string, configuration *
 		}
 
 		var c *types.Configuration
-		c, err = p.loadFileConfig(path.Join(directory, item.Name()))
+		c, err = p.loadFileConfig(path.Join(directory, item.Name()), true)
 
 		if err != nil {
 			return configuration, err