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

diff --git a/lib/xdsconfig/fileconfig.go b/lib/xdsconfig/fileconfig.go
index ee9ca14..374afa3 100644
--- a/lib/xdsconfig/fileconfig.go
+++ b/lib/xdsconfig/fileconfig.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 "IoT.bzh"
+ * Copyright (C) 2017-2018 "IoT.bzh"
  * Author Sebastien Douheret <sebastien@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -25,18 +25,18 @@ import (
 	"path/filepath"
 	"strings"
 
-	common "github.com/iotbzh/xds-common/golib"
+	common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
 )
 
 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
 	FoldersConfigFilename = "server-config_folders.xml"
+	// TargetsConfigFilename Targets config filename
+	TargetsConfigFilename = "server-config_targets.xml"
 )
 
 // SyncThingConf definition
@@ -48,34 +48,34 @@ 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"`
+	SdkDbUpdate   string         `json:"sdkDbUpdate"`
+	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)
 	if confFile != "" {
 		searchIn = append(searchIn, confFile)
 	}
-	if usr, err := user.Current(); err == nil {
-		searchIn = append(searchIn, path.Join(usr.HomeDir, ConfigDir,
-			GlobalConfigFilename))
+	if _, err := user.Current(); err == nil {
+		searchIn = append(searchIn, path.Join(ConfigRootDir(), 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,22 +113,15 @@ 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)
 	}
-	for _, field := range vars {
-		var err error
-		if *field, err = common.ResolveEnvVar(*field); err != nil {
-			return err
-		}
-	}
-
 	// Use config file settings else use default config
 	if fCfg.WebAppDir == "" {
 		fCfg.WebAppDir = c.FileConf.WebAppDir
@@ -136,8 +129,11 @@ 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.SdkDbUpdate == "" {
+		fCfg.SdkDbUpdate = c.FileConf.SdkDbUpdate
 	}
 	if fCfg.HTTPPort == "" {
 		fCfg.HTTPPort = c.FileConf.HTTPPort
@@ -146,6 +142,13 @@ func readGlobalConfig(c *Config, confFile string) error {
 		fCfg.LogsDir = c.FileConf.LogsDir
 	}
 
+	for _, field := range vars {
+		var err error
+		if *field, err = common.ResolveEnvVar(*field); err != nil {
+			return err
+		}
+	}
+
 	// Resolve webapp dir (support relative or full path)
 	fCfg.WebAppDir = strings.Trim(fCfg.WebAppDir, " ")
 	if !strings.HasPrefix(fCfg.WebAppDir, "/") && exePath != "" {
@@ -166,19 +169,20 @@ func readGlobalConfig(c *Config, confFile string) error {
 }
 
 func configFilenameGet(cfgFile string) (string, error) {
-	usr, err := user.Current()
-	if err != nil {
-		return "", err
-	}
-	return path.Join(usr.HomeDir, ConfigDir, cfgFile), nil
+	return path.Join(ConfigRootDir(), cfgFile), nil
 }
 
-// FoldersConfigFilenameGet
+// FoldersConfigFilenameGet Return the FoldersConfig filename
 func FoldersConfigFilenameGet() (string, error) {
 	return configFilenameGet(FoldersConfigFilename)
 }
 
-// ServerDataFilenameGet
+// TargetsConfigFilenameGet Return the TargetsConfig filename
+func TargetsConfigFilenameGet() (string, error) {
+	return configFilenameGet(TargetsConfigFilename)
+}
+
+// ServerDataFilenameGet Return the ServerData filename
 func ServerDataFilenameGet() (string, error) {
 	return configFilenameGet(ServerDataFilename)
 }