X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fxdsconfig%2Fconfig.go;h=ee20bd228f874105d2816db50809dcb1919aa216;hb=e97eebc18d726aa55738d7e19513491cf58a6e3a;hp=3a82b4414dec98c407c99c217a7531ae77fdd056;hpb=1ecdc95d837e73509243d436fcafea0920599fbe;p=src%2Fxds%2Fxds-server.git

diff --git a/lib/xdsconfig/config.go b/lib/xdsconfig/config.go
index 3a82b44..ee20bd2 100644
--- 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");
@@ -23,10 +23,10 @@ import (
 	"os"
 	"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
@@ -56,6 +56,7 @@ const (
 	DefaultShareDir      = "${HOME}/.xds/server/projects"
 	DefaultSTHomeDir     = "${HOME}/.xds/server/syncthing-config"
 	DefaultSdkScriptsDir = "${EXEPATH}/sdks"
+	DefaultSdkDbUpdate   = "startup"
 )
 
 // Init loads the configuration on start-up
@@ -85,7 +86,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 +99,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:       "",