X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fxdsconfig%2Ffileconfig.go;h=bf8aa25c6ab953658c068406e76db03b7ef7b4f7;hb=f1c182ede3c4aed0d6196d05b0a64ff93372e755;hp=ee9ca147413b2c0c2e5dc86396d82cef50ba641d;hpb=9fb41a3693eeaac9adea71112232abaafea54c8f;p=src%2Fxds%2Fxds-server.git

diff --git a/lib/xdsconfig/fileconfig.go b/lib/xdsconfig/fileconfig.go
index ee9ca14..bf8aa25 100644
--- a/lib/xdsconfig/fileconfig.go
+++ b/lib/xdsconfig/fileconfig.go
@@ -28,11 +28,12 @@ import (
 	common "github.com/iotbzh/xds-common/golib"
 )
 
+// ConfigDir Directory in user HOME directory where xds config will be saved
+var ConfigDir = path.Join(".xds", "server")
+
 const (
-	// ConfigDir Directory in user HOME directory where xds config will be saved
-	ConfigDir = ".xds-server"
 	// GlobalConfigFilename Global config filename
-	GlobalConfigFilename = "config.json"
+	GlobalConfigFilename = "server-config.json"
 	// ServerDataFilename Server data filename
 	ServerDataFilename = "server-data.xml"
 	// FoldersConfigFilename Folders config filename
@@ -48,22 +49,22 @@ type SyncThingConf struct {
 	RescanIntervalS int    `json:"rescanIntervalS"`
 }
 
-// FileConfig is the JSON structure of xds-server config file (config.json)
+// FileConfig is the JSON structure of xds-server config file (server-config.json)
 type FileConfig struct {
-	WebAppDir    string         `json:"webAppDir"`
-	ShareRootDir string         `json:"shareRootDir"`
-	SdkRootDir   string         `json:"sdkRootDir"`
-	HTTPPort     string         `json:"httpPort"`
-	SThgConf     *SyncThingConf `json:"syncthing"`
-	LogsDir      string         `json:"logsDir"`
+	WebAppDir     string         `json:"webAppDir"`
+	ShareRootDir  string         `json:"shareRootDir"`
+	SdkScriptsDir string         `json:"sdkScriptsDir"`
+	HTTPPort      string         `json:"httpPort"`
+	SThgConf      *SyncThingConf `json:"syncthing"`
+	LogsDir       string         `json:"logsDir"`
 }
 
 // readGlobalConfig reads configuration from a config file.
 // Order to determine which config file is used:
 //  1/ from command line option: "--config myConfig.json"
-//  2/ $HOME/.xds-server/config.json file
-//  3/ /etc/xds-server/config.json file
-//  4/ <xds-server executable dir>/config.json file
+//  2/ $HOME/.xds/server/server-config.json file
+//  3/ /etc/xds/server/server-config.json file
+//  4/ <xds-server executable dir>/server-config.json file
 func readGlobalConfig(c *Config, confFile string) error {
 
 	searchIn := make([]string, 0, 3)
@@ -71,11 +72,10 @@ func readGlobalConfig(c *Config, confFile string) error {
 		searchIn = append(searchIn, confFile)
 	}
 	if usr, err := user.Current(); err == nil {
-		searchIn = append(searchIn, path.Join(usr.HomeDir, ConfigDir,
-			GlobalConfigFilename))
+		searchIn = append(searchIn, path.Join(usr.HomeDir, ConfigDir, GlobalConfigFilename))
 	}
 
-	searchIn = append(searchIn, "/etc/xds-server/config.json")
+	searchIn = append(searchIn, "/etc/xds/server/server-config.json")
 
 	exePath := os.Args[0]
 	ee, _ := os.Executable()
@@ -88,7 +88,7 @@ func readGlobalConfig(c *Config, confFile string) error {
 			exePath = filepath.Dir(exeAbsPath)
 		}
 	}
-	searchIn = append(searchIn, path.Join(exePath, "config.json"))
+	searchIn = append(searchIn, path.Join(exePath, "server-config.json"))
 
 	var cFile *string
 	for _, p := range searchIn {
@@ -113,11 +113,11 @@ func readGlobalConfig(c *Config, confFile string) error {
 		return err
 	}
 
-	// Support environment variables (IOW ${MY_ENV_VAR} syntax) in config.json
+	// Support environment variables (IOW ${MY_ENV_VAR} syntax) in server-config.json
 	vars := []*string{
 		&fCfg.WebAppDir,
 		&fCfg.ShareRootDir,
-		&fCfg.SdkRootDir,
+		&fCfg.SdkScriptsDir,
 		&fCfg.LogsDir}
 	if fCfg.SThgConf != nil {
 		vars = append(vars, &fCfg.SThgConf.Home, &fCfg.SThgConf.BinDir)
@@ -136,8 +136,8 @@ func readGlobalConfig(c *Config, confFile string) error {
 	if fCfg.ShareRootDir == "" {
 		fCfg.ShareRootDir = c.FileConf.ShareRootDir
 	}
-	if fCfg.SdkRootDir == "" {
-		fCfg.SdkRootDir = c.FileConf.SdkRootDir
+	if fCfg.SdkScriptsDir == "" {
+		fCfg.SdkScriptsDir = c.FileConf.SdkScriptsDir
 	}
 	if fCfg.HTTPPort == "" {
 		fCfg.HTTPPort = c.FileConf.HTTPPort