diff options
| author |   Sebastien Douheret <sebastien.douheret@iot.bzh> | 2017-12-11 11:09:35 +0100 |
|---|---|---|
| committer | Sebastien Douheret <sebastien.douheret@iot.bzh> | 2017-12-11 15:49:30 +0100 |
| commit | 963931e04d44a5b40d38817163f52f56241a9f33 (patch) | |
| tree | 986841498f9c998549ee175c240713709e32510a /lib/xdsserver | |
| parent | e9fa58ca8a03f03e6022955fd4934e6fda5876ee (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/xdsserver')
| -rw-r--r-- | lib/xdsserver/apiv1-exec.go | 2 | ||||
| -rw-r--r-- | lib/xdsserver/xdsserver.go | 2 |
2 files changed, 2 insertions, 2 deletions
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) } |