summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorSebastien Douheret <sebastien.douheret@iot.bzh>2017-12-11 11:09:35 +0100
committerSebastien Douheret <sebastien.douheret@iot.bzh>2017-12-11 15:49:30 +0100
commit963931e04d44a5b40d38817163f52f56241a9f33 (patch)
tree986841498f9c998549ee175c240713709e32510a /lib
parente9fa58ca8a03f03e6022955fd4934e6fda5876ee (diff)
Standardized XDS config file name and location.
- config file name is : server-config.json - xds-server settings under user's home is: $HOME/.xds/server - xds-server settings under etc is: /etc/xds/server Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>
Diffstat (limited to 'lib')
-rw-r--r--lib/syncthing/st.go2
-rw-r--r--lib/xdsconfig/config.go4
-rw-r--r--lib/xdsconfig/fileconfig.go24
-rw-r--r--lib/xdsserver/apiv1-exec.go2
-rw-r--r--lib/xdsserver/xdsserver.go2
5 files changed, 17 insertions, 17 deletions
diff --git a/lib/syncthing/st.go b/lib/syncthing/st.go
index 2db4699..a52e1fe 100644
--- a/lib/syncthing/st.go
+++ b/lib/syncthing/st.go
@@ -249,7 +249,7 @@ func (s *SyncThing) Start() (*exec.Cmd, error) {
s.STCmd, err = s.startProc("syncthing", args, env, &s.exitSTChan)
- // Use autogenerated apikey if not set by config.json
+ // Use autogenerated apikey if not set by server-config.json
if err == nil && s.APIKey == "" {
if fd, err := os.Open(filepath.Join(s.Home, "config.xml")); err == nil {
defer fd.Close()
diff --git a/lib/xdsconfig/config.go b/lib/xdsconfig/config.go
index 8ee6803..59cf394 100644
--- a/lib/xdsconfig/config.go
+++ b/lib/xdsconfig/config.go
@@ -53,8 +53,8 @@ type Options struct {
const (
DefaultAPIVersion = "1"
DefaultPort = "8000"
- DefaultShareDir = "${HOME}/.xds-server/projects"
- DefaultSTHomeDir = "${HOME}/.xds-server/syncthing-config"
+ DefaultShareDir = "${HOME}/.xds/server/projects"
+ DefaultSTHomeDir = "${HOME}/.xds/server/syncthing-config"
DefaultSdkRootDir = "/xdt/sdk"
)
diff --git a/lib/xdsconfig/fileconfig.go b/lib/xdsconfig/fileconfig.go
index ee9ca14..8e77de7 100644
--- a/lib/xdsconfig/fileconfig.go
+++ b/lib/xdsconfig/fileconfig.go
@@ -28,11 +28,12 @@ import (
common "github.com/iotbzh/xds-common/golib"
)
+// ConfigDir Directory in user HOME directory where xds config will be saved
+var ConfigDir = path.Join(".xds", "server")
+
const (
- // ConfigDir Directory in user HOME directory where xds config will be saved
- ConfigDir = ".xds-server"
// GlobalConfigFilename Global config filename
- GlobalConfigFilename = "config.json"
+ GlobalConfigFilename = "server-config.json"
// ServerDataFilename Server data filename
ServerDataFilename = "server-data.xml"
// FoldersConfigFilename Folders config filename
@@ -48,7 +49,7 @@ type SyncThingConf struct {
RescanIntervalS int `json:"rescanIntervalS"`
}
-// FileConfig is the JSON structure of xds-server config file (config.json)
+// FileConfig is the JSON structure of xds-server config file (server-config.json)
type FileConfig struct {
WebAppDir string `json:"webAppDir"`
ShareRootDir string `json:"shareRootDir"`
@@ -61,9 +62,9 @@ type FileConfig struct {
// readGlobalConfig reads configuration from a config file.
// Order to determine which config file is used:
// 1/ from command line option: "--config myConfig.json"
-// 2/ $HOME/.xds-server/config.json file
-// 3/ /etc/xds-server/config.json file
-// 4/ <xds-server executable dir>/config.json file
+// 2/ $HOME/.xds/server/server-config.json file
+// 3/ /etc/xds/server/server-config.json file
+// 4/ <xds-server executable dir>/server-config.json file
func readGlobalConfig(c *Config, confFile string) error {
searchIn := make([]string, 0, 3)
@@ -71,11 +72,10 @@ func readGlobalConfig(c *Config, confFile string) error {
searchIn = append(searchIn, confFile)
}
if usr, err := user.Current(); err == nil {
- searchIn = append(searchIn, path.Join(usr.HomeDir, ConfigDir,
- GlobalConfigFilename))
+ searchIn = append(searchIn, path.Join(usr.HomeDir, ConfigDir, GlobalConfigFilename))
}
- searchIn = append(searchIn, "/etc/xds-server/config.json")
+ searchIn = append(searchIn, "/etc/xds/server/server-config.json")
exePath := os.Args[0]
ee, _ := os.Executable()
@@ -88,7 +88,7 @@ func readGlobalConfig(c *Config, confFile string) error {
exePath = filepath.Dir(exeAbsPath)
}
}
- searchIn = append(searchIn, path.Join(exePath, "config.json"))
+ searchIn = append(searchIn, path.Join(exePath, "server-config.json"))
var cFile *string
for _, p := range searchIn {
@@ -113,7 +113,7 @@ func readGlobalConfig(c *Config, confFile string) error {
return err
}
- // Support environment variables (IOW ${MY_ENV_VAR} syntax) in config.json
+ // Support environment variables (IOW ${MY_ENV_VAR} syntax) in server-config.json
vars := []*string{
&fCfg.WebAppDir,
&fCfg.ShareRootDir,
diff --git a/lib/xdsserver/apiv1-exec.go b/lib/xdsserver/apiv1-exec.go
index 47e85ea..bc45fdb 100644
--- a/lib/xdsserver/apiv1-exec.go
+++ b/lib/xdsserver/apiv1-exec.go
@@ -143,7 +143,7 @@ func (s *APIService) execCmd(c *gin.Context) {
// Set command execution timeout
if args.CmdTimeout == 0 {
// 0 : default timeout
- // TODO get default timeout from config.json file
+ // TODO get default timeout from server-config.json file
execWS.CmdExecTimeout = 24 * 60 * 60 // 1 day
} else {
execWS.CmdExecTimeout = args.CmdTimeout
diff --git a/lib/xdsserver/xdsserver.go b/lib/xdsserver/xdsserver.go
index 5079553..64041b9 100644
--- a/lib/xdsserver/xdsserver.go
+++ b/lib/xdsserver/xdsserver.go
@@ -128,7 +128,7 @@ func (ctx *Context) Run() (int, error) {
ctx._logPrint("Logging file for HTTP requests: %s\n", logFileHTTPReq)
}
- // Create syncthing instance when section "syncthing" is present in config.json
+ // Create syncthing instance when section "syncthing" is present in server-config.json
if ctx.Config.FileConf.SThgConf != nil {
ctx.SThg = st.NewSyncThing(ctx.Config, ctx.Log)
}