summaryrefslogtreecommitdiffstats
path: root/lib/xdsconfig/configfile.go
diff options
context:
space:
mode:
authorSebastien Douheret <sebastien.douheret@iot.bzh>2017-12-11 11:05:55 +0100
committerSebastien Douheret <sebastien.douheret@iot.bzh>2017-12-11 15:46:53 +0100
commit57bdfc8349b3c8a727d6f439e1fd12661bc00a15 (patch)
tree9682a32b7feb2f6ac7429f01bcca6ac77327a8d3 /lib/xdsconfig/configfile.go
parent7adfd21a66846ebb907bdcfd411e00670d70fa06 (diff)
Standardized XDS config file name and location.
- config file name is : agent-config.json - xds-agent settings under user's home is: $HOME/.xds/agent - xds-agent settings under etc is: /etc/xds/agent Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>
Diffstat (limited to 'lib/xdsconfig/configfile.go')
-rw-r--r--lib/xdsconfig/configfile.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/xdsconfig/configfile.go b/lib/xdsconfig/configfile.go
index 71870d0..c252073 100644
--- a/lib/xdsconfig/configfile.go
+++ b/lib/xdsconfig/configfile.go
@@ -55,7 +55,7 @@ type FileConfig struct {
// Order to determine which config file is used:
// 1/ from command line option: "--config myConfig.json"
// 2/ $HOME/.xds/agent/agent-config.json file
-// 3/ /etc/xds-agent/config.json file
+// 3/ /etc/xds/agent/agent-config.json file
func readGlobalConfig(c *Config, confFile string) error {
@@ -67,7 +67,7 @@ func readGlobalConfig(c *Config, confFile string) error {
searchIn = append(searchIn, path.Join(homeDir, ".xds", "agent", "agent-config.json"))
}
- searchIn = append(searchIn, "/etc/xds-agent/agent-config.json")
+ searchIn = append(searchIn, "/etc/xds/agent/agent-config.json")
var cFile *string
for _, p := range searchIn {