summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastien Douheret <sebastien.douheret@iot.bzh>2017-10-12 17:34:29 +0200
committerSebastien Douheret <sebastien.douheret@iot.bzh>2017-10-12 17:37:56 +0200
commit96fb2907b5a3e7f348684749d5eb717e79fb2c61 (patch)
treebc958b906c499b9139b2a9e5f6ce352722a34dc3
parent9fd633261e9e505e73022a01330420ec3e6b82dc (diff)
Used non default syncthing port to avoid confict.
-rw-r--r--conf.d/etc/xds-server/config.json2
-rw-r--r--config.json.in2
-rw-r--r--lib/syncthing/st.go2
-rw-r--r--webapp/src/app/services/config.service.ts2
-rw-r--r--webapp/src/app/services/syncthing.service.ts2
5 files changed, 5 insertions, 5 deletions
diff --git a/conf.d/etc/xds-server/config.json b/conf.d/etc/xds-server/config.json
index 02d87bf..4dbe501 100644
--- a/conf.d/etc/xds-server/config.json
+++ b/conf.d/etc/xds-server/config.json
@@ -6,6 +6,6 @@
"syncthing": {
"binDir": "",
"home": "${HOME}/.xds-server/syncthing-config",
- "gui-address": "http://localhost:8384"
+ "gui-address": "http://localhost:8385"
}
}
diff --git a/config.json.in b/config.json.in
index 6116439..ac2f891 100644
--- a/config.json.in
+++ b/config.json.in
@@ -7,6 +7,6 @@
"syncthing": {
"binDir": "./bin",
"home": "${HOME}/.xds-server/syncthing-config",
- "gui-address": "http://localhost:8384"
+ "gui-address": "http://localhost:8385"
}
}
diff --git a/lib/syncthing/st.go b/lib/syncthing/st.go
index bc65299..99a17a1 100644
--- a/lib/syncthing/st.go
+++ b/lib/syncthing/st.go
@@ -101,7 +101,7 @@ func NewSyncThing(conf *xdsconfig.Config, log *logrus.Logger) *SyncThing {
}
if url == "" {
- url = "http://localhost:8384"
+ url = "http://localhost:8385"
}
if url[0:7] != "http://" {
url = "http://" + url
diff --git a/webapp/src/app/services/config.service.ts b/webapp/src/app/services/config.service.ts
index 98dec34..3f07a6a 100644
--- a/webapp/src/app/services/config.service.ts
+++ b/webapp/src/app/services/config.service.ts
@@ -125,7 +125,7 @@ export class ConfigService {
projects: [],
localSThg: {
ID: null,
- URL: "http://localhost:8384",
+ URL: "http://localhost:8385",
retry: 10, // 10 seconds
tilde: "",
}
diff --git a/webapp/src/app/services/syncthing.service.ts b/webapp/src/app/services/syncthing.service.ts
index aefb039..2e6da1c 100644
--- a/webapp/src/app/services/syncthing.service.ts
+++ b/webapp/src/app/services/syncthing.service.ts
@@ -104,7 +104,7 @@ interface ISTConfiguration {
}
// Default settings
-const DEFAULT_GUI_PORT = 8384;
+const DEFAULT_GUI_PORT = 8386;
const DEFAULT_GUI_API_KEY = "1234abcezam";
const DEFAULT_RESCAN_INTERV = 0; // 0: use syncthing-inotify to detect changes