Standardized XDS config file name and location.

[src/xds/xds-agent.git] / lib / xdsconfig / configfile.go

diff --git a/lib/xdsconfig/configfile.go b/lib/xdsconfig/configfile.go
index a47038b..c252073 100644 (file)
--- a/lib/xdsconfig/configfile.go
+++ b/lib/xdsconfig/configfile.go
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2017 "IoT.bzh"
+ * Author Sebastien Douheret <sebastien@iot.bzh>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package xdsconfig
 
 import (
@@ -26,10 +43,10 @@ type XDSServerConf struct {
 }
 
 type FileConfig struct {
-       HTTPPort  string `json:"httpPort"`
-       WebAppDir string `json:"webAppDir"`
-       LogsDir   string `json:"logsDir"`
-       // SEB A SUP ? XDSAPIKey string         `json:"xds-apikey"`
+       HTTPPort    string          `json:"httpPort"`
+       WebAppDir   string          `json:"webAppDir"`
+       LogsDir     string          `json:"logsDir"`
+       XDSAPIKey   string          `json:"xds-apikey"`
        ServersConf []XDSServerConf `json:"xdsServers"`
        SThgConf    *SyncThingConf  `json:"syncthing"`
 }
@@ -38,8 +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/ <current_dir>/agent-config.json file
-//  4/ <executable dir>/agent-config.json file
+//  3/ /etc/xds/agent/agent-config.json file
 
 func readGlobalConfig(c *Config, confFile string) error {
 
@@ -51,9 +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, path.Join(common.GetExePath(), "agent-config.json"))
+       searchIn = append(searchIn, "/etc/xds/agent/agent-config.json")
 
        var cFile *string
        for _, p := range searchIn {