X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fxdsconfig%2Fconfig.go;h=84e07789f8efb7ab81d94ee265808180c0d7c1bd;hb=1966f9e786dfb67543401d181a374bd7f3856f37;hp=f3cba4aeb0e2873a2945e75bcbb74fbeb65dee40;hpb=c6c53d11b08251056fba48f47b3e2349d6bed114;p=src%2Fxds%2Fxds-server.git

diff --git a/lib/xdsconfig/config.go b/lib/xdsconfig/config.go
index f3cba4a..84e0778 100644
--- a/lib/xdsconfig/config.go
+++ b/lib/xdsconfig/config.go
@@ -38,6 +38,7 @@ const (
 	DefaultAPIVersion = "1"
 	DefaultPort       = "8000"
 	DefaultShareDir   = "${HOME}/.xds-server/projects"
+	DefaultSTHomeDir  = "${HOME}/.xds-server/syncthing-config"
 	DefaultSdkRootDir = "/xdt/sdk"
 )
 
@@ -45,6 +46,15 @@ const (
 func Init(cliCtx *cli.Context, log *logrus.Logger) (*Config, error) {
 	var err error
 
+	dfltShareDir := DefaultShareDir
+	dfltSTHomeDir := DefaultSTHomeDir
+	if resDir, err := common.ResolveEnvVar(DefaultShareDir); err == nil {
+		dfltShareDir = resDir
+	}
+	if resDir, err := common.ResolveEnvVar(DefaultSTHomeDir); err == nil {
+		dfltSTHomeDir = resDir
+	}
+
 	// Define default configuration
 	c := Config{
 		Version:       cliCtx.App.Metadata["version"].(string),
@@ -60,9 +70,10 @@ func Init(cliCtx *cli.Context, log *logrus.Logger) (*Config, error) {
 		},
 		FileConf: FileConfig{
 			WebAppDir:    "webapp/dist",
-			ShareRootDir: DefaultShareDir,
+			ShareRootDir: dfltShareDir,
 			SdkRootDir:   DefaultSdkRootDir,
 			HTTPPort:     DefaultPort,
+			SThgConf:     &SyncThingConf{Home: dfltSTHomeDir},
 			LogsDir:      "",
 		},
 		Log: log,