X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fxdsconfig%2Ffileconfig.go;h=86f39b5bdf64508603850822c86cb6542baefc43;hb=65e09e831cf13343ac713fbf15281174d1f13a94;hp=46afc578361e5bcb8bb464d67e3511a906edf9a6;hpb=2a7a112bbffcd41a3436c086f1910ea7a9c94744;p=src%2Fxds%2Fxds-server.git diff --git a/lib/xdsconfig/fileconfig.go b/lib/xdsconfig/fileconfig.go index 46afc57..86f39b5 100644 --- a/lib/xdsconfig/fileconfig.go +++ b/lib/xdsconfig/fileconfig.go @@ -38,6 +38,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 @@ -54,6 +56,7 @@ type FileConfig struct { 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"` @@ -139,6 +142,9 @@ func readGlobalConfig(c *Config, confFile string) error { if fCfg.SdkScriptsDir == "" { fCfg.SdkScriptsDir = c.FileConf.SdkScriptsDir } + if fCfg.SdkDbUpdate == "" { + fCfg.SdkDbUpdate = c.FileConf.SdkDbUpdate + } if fCfg.HTTPPort == "" { fCfg.HTTPPort = c.FileConf.HTTPPort } @@ -173,12 +179,17 @@ func configFilenameGet(cfgFile string) (string, error) { return path.Join(usr.HomeDir, ConfigDir, 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) }