diff --git a/backends/file/client.go b/backends/file/client.go index 7ee238b0b..7289edd9c 100644 --- a/backends/file/client.go +++ b/backends/file/client.go @@ -46,7 +46,7 @@ func readFile(path string, vars map[string]string) error { return err } err = nodeWalk(fileMap, "/", vars) - case ".yml", ".yaml": + case "", ".yml", ".yaml": fileMap := make(map[interface{}]interface{}) err = yaml.Unmarshal(data, &fileMap) if err != nil { diff --git a/integration/file/test_yaml.sh b/integration/file/test_yaml.sh index b604de5e6..a2d7ec520 100755 --- a/integration/file/test_yaml.sh +++ b/integration/file/test_yaml.sh @@ -2,7 +2,7 @@ export HOSTNAME="localhost" mkdir backends1 backends2 -cat <> backends1/1.yaml +cat <> backends1/1 key: foobar database: host: 127.0.0.1 @@ -11,7 +11,7 @@ database: username: confd EOT -cat <> backends1/2.yaml +cat <> backends1/2.yml upstream: app1: 10.0.1.10:8080 app2: 10.0.1.11:8080 diff --git a/version.go b/version.go index ca563e9a8..89184d714 100644 --- a/version.go +++ b/version.go @@ -1,6 +1,6 @@ package main -const Version = "0.18.3-dev" +const Version = "0.18.3" // We want to replace this variable at build time with "-ldflags -X main.GitSHA=xxx", where const is not supported. var GitSHA = ""