fileconfig: env variables after default values

[src/xds/xds-server.git] / lib / xdsconfig / fileconfig.go

diff --git a/lib/xdsconfig/fileconfig.go b/lib/xdsconfig/fileconfig.go
index ef207ec..374afa3 100644 (file)
--- a/lib/xdsconfig/fileconfig.go
+++ b/lib/xdsconfig/fileconfig.go
@@ -28,9 +28,6 @@ import (
        common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
 )
 
-// ConfigDir Directory in user HOME directory where xds config will be saved
-var ConfigDir = path.Join(".xds", "server")
-
 const (
        // GlobalConfigFilename Global config filename
        GlobalConfigFilename = "server-config.json"
@@ -38,6 +35,8 @@ const (
        ServerDataFilename = "server-data.xml"
        // FoldersConfigFilename Folders config filename
        FoldersConfigFilename = "server-config_folders.xml"
+       // TargetsConfigFilename Targets config filename
+       TargetsConfigFilename = "server-config_targets.xml"
 )
 
 // SyncThingConf definition
@@ -72,8 +71,8 @@ func readGlobalConfig(c *Config, confFile string) error {
        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/server-config.json")
@@ -123,13 +122,6 @@ func readGlobalConfig(c *Config, confFile string) error {
        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
@@ -150,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 != "" {
@@ -170,11 +169,7 @@ 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 Return the FoldersConfig filename
@@ -182,6 +177,11 @@ func FoldersConfigFilenameGet() (string, error) {
        return configFilenameGet(FoldersConfigFilename)
 }
 
+// TargetsConfigFilenameGet Return the TargetsConfig filename
+func TargetsConfigFilenameGet() (string, error) {
+       return configFilenameGet(TargetsConfigFilename)
+}
+
 // ServerDataFilenameGet Return the ServerData filename
 func ServerDataFilenameGet() (string, error) {
        return configFilenameGet(ServerDataFilename)