Add XDS_SERVER_ROOT_CFG_DIR env var support

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

diff --git a/lib/xdsconfig/config.go b/lib/xdsconfig/config.go
index 3a82b44..ca5b5cb 100644 (file)
--- a/lib/xdsconfig/config.go
+++ b/lib/xdsconfig/config.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");
@@ -21,12 +21,14 @@ import (
        "fmt"
        "io"
        "os"
+       "os/user"
+       "path"
        "path/filepath"
 
+       common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
+       "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
        "github.com/Sirupsen/logrus"
        "github.com/codegangsta/cli"
-       common "github.com/iotbzh/xds-common/golib"
-       "github.com/iotbzh/xds-server/lib/xsapiv1"
 )
 
 // Config parameters (json format) of /config command
@@ -53,21 +55,22 @@ type Options struct {
 const (
        DefaultAPIVersion    = "1"
        DefaultPort          = "8000"
-       DefaultShareDir      = "${HOME}/.xds/server/projects"
-       DefaultSTHomeDir     = "${HOME}/.xds/server/syncthing-config"
+       DefaultShareDir      = "projects"
+       DefaultSTHomeDir     = "syncthing-config"
        DefaultSdkScriptsDir = "${EXEPATH}/sdks"
+       DefaultSdkDbUpdate   = "startup"
 )
 
 // Init loads the configuration on start-up
 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 := path.Join(ConfigRootDir(), DefaultShareDir)
+       dfltSTHomeDir := path.Join(ConfigRootDir(), DefaultSTHomeDir)
+       if resDir, err := common.ResolveEnvVar(dfltShareDir); err == nil {
                dfltShareDir = resDir
        }
-       if resDir, err := common.ResolveEnvVar(DefaultSTHomeDir); err == nil {
+       if resDir, err := common.ResolveEnvVar(dfltSTHomeDir); err == nil {
                dfltSTHomeDir = resDir
        }
 
@@ -85,7 +88,7 @@ func Init(cliCtx *cli.Context, log *logrus.Logger) (*Config, error) {
                        APIVersion:       DefaultAPIVersion,
                        VersionGitTag:    cliCtx.App.Metadata["git-tag"].(string),
                        Builder:          xsapiv1.BuilderConfig{},
-                       SupportedSharing: map[string]bool{ /*FIXME USE folder.TypePathMap*/ "PathMap": true},
+                       SupportedSharing: map[string]bool{xsapiv1.TypePathMap: true},
                },
 
                Options: Options{
@@ -98,6 +101,7 @@ func Init(cliCtx *cli.Context, log *logrus.Logger) (*Config, error) {
                        WebAppDir:     "webapp/dist",
                        ShareRootDir:  dfltShareDir,
                        SdkScriptsDir: DefaultSdkScriptsDir,
+                       SdkDbUpdate:   DefaultSdkDbUpdate,
                        HTTPPort:      DefaultPort,
                        SThgConf:      &SyncThingConf{Home: dfltSTHomeDir},
                        LogsDir:       "",
@@ -155,3 +159,18 @@ func Init(cliCtx *cli.Context, log *logrus.Logger) (*Config, error) {
 
        return &c, nil
 }
+
+// ConfigRootDir return the root directory where xds server save all config files
+func ConfigRootDir() string {
+       root := "$HOME"
+       if usr, err := user.Current(); err == nil {
+               root = usr.HomeDir
+       }
+
+       // Default $HOME/.xds/server but may be changed by an env variable
+       if envVar, envDef := os.LookupEnv("XDS_SERVER_ROOT_CFG_DIR"); envDef {
+               root = envVar
+       }
+
+       return path.Join(root, "/.xds/server")
+}