summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--conf.d/etc/xds/server/server-config.json2
-rw-r--r--lib/xdsconfig/config.go20
2 files changed, 11 insertions, 11 deletions
diff --git a/conf.d/etc/xds/server/server-config.json b/conf.d/etc/xds/server/server-config.json
index a27d4f5..47b75ef 100644
--- a/conf.d/etc/xds/server/server-config.json
+++ b/conf.d/etc/xds/server/server-config.json
@@ -2,7 +2,7 @@
"webAppDir": "www",
"httpPort": "8000",
"shareRootDir": "${HOME}/.xds/server/projects",
- "sdkScriptsDir": "${EXEPATH}/scripts/sdks",
+ "sdkScriptsDir": "${EXEPATH}/sdks",
"syncthing": {
"binDir": "",
"home": "${HOME}/.xds/server/syncthing-config",
diff --git a/lib/xdsconfig/config.go b/lib/xdsconfig/config.go
index 74ce21e..3a82b44 100644
--- a/lib/xdsconfig/config.go
+++ b/lib/xdsconfig/config.go
@@ -51,11 +51,11 @@ type Options struct {
// Config default values
const (
- DefaultAPIVersion = "1"
- DefaultPort = "8000"
- DefaultShareDir = "${HOME}/.xds/server/projects"
- DefaultSTHomeDir = "${HOME}/.xds/server/syncthing-config"
- DefaultSdkScriptsDir = "${EXEPATH}/scripts/sdks"
+ DefaultAPIVersion = "1"
+ DefaultPort = "8000"
+ DefaultShareDir = "${HOME}/.xds/server/projects"
+ DefaultSTHomeDir = "${HOME}/.xds/server/syncthing-config"
+ DefaultSdkScriptsDir = "${EXEPATH}/sdks"
)
// Init loads the configuration on start-up
@@ -95,12 +95,12 @@ func Init(cliCtx *cli.Context, log *logrus.Logger) (*Config, error) {
NoFolderConfig: cliCtx.GlobalBool("no-folderconfig"),
},
FileConf: FileConfig{
- WebAppDir: "webapp/dist",
- ShareRootDir: dfltShareDir,
+ WebAppDir: "webapp/dist",
+ ShareRootDir: dfltShareDir,
SdkScriptsDir: DefaultSdkScriptsDir,
- HTTPPort: DefaultPort,
- SThgConf: &SyncThingConf{Home: dfltSTHomeDir},
- LogsDir: "",
+ HTTPPort: DefaultPort,
+ SThgConf: &SyncThingConf{Home: dfltSTHomeDir},
+ LogsDir: "",
},
Log: log,
}