Code Review
/
src
/
xds
/
xds-server.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
|
inline
| side by side (parent:
9fd6332
)
Used non default syncthing port to avoid confict.
author
Sebastien Douheret
<sebastien.douheret@iot.bzh>
Thu, 12 Oct 2017 15:34:29 +0000
(17:34 +0200)
committer
Sebastien Douheret
<sebastien.douheret@iot.bzh>
Thu, 12 Oct 2017 15:37:56 +0000
(17:37 +0200)
conf.d/etc/xds-server/config.json
patch
|
blob
|
history
config.json.in
patch
|
blob
|
history
lib/syncthing/st.go
patch
|
blob
|
history
webapp/src/app/services/config.service.ts
patch
|
blob
|
history
webapp/src/app/services/syncthing.service.ts
patch
|
blob
|
history
diff --git
a/conf.d/etc/xds-server/config.json
b/conf.d/etc/xds-server/config.json
index
02d87bf
..
4dbe501
100644
(file)
--- 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",
"syncthing": {
"binDir": "",
"home": "${HOME}/.xds-server/syncthing-config",
- "gui-address": "http://localhost:838
4
"
+ "gui-address": "http://localhost:838
5
"
}
}
}
}
diff --git
a/config.json.in
b/config.json.in
index
6116439
..
ac2f891
100644
(file)
--- a/
config.json.in
+++ b/
config.json.in
@@
-7,6
+7,6
@@
"syncthing": {
"binDir": "./bin",
"home": "${HOME}/.xds-server/syncthing-config",
"syncthing": {
"binDir": "./bin",
"home": "${HOME}/.xds-server/syncthing-config",
- "gui-address": "http://localhost:838
4
"
+ "gui-address": "http://localhost:838
5
"
}
}
}
}
diff --git
a/lib/syncthing/st.go
b/lib/syncthing/st.go
index
bc65299
..
99a17a1
100644
(file)
--- 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 == "" {
}
if url == "" {
- url = "http://localhost:838
4
"
+ url = "http://localhost:838
5
"
}
if url[0:7] != "http://" {
url = "http://" + url
}
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
(file)
--- 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,
projects: [],
localSThg: {
ID: null,
- URL: "http://localhost:838
4
",
+ URL: "http://localhost:838
5
",
retry: 10, // 10 seconds
tilde: "",
}
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
(file)
--- a/
webapp/src/app/services/syncthing.service.ts
+++ b/
webapp/src/app/services/syncthing.service.ts
@@
-104,7
+104,7
@@
interface ISTConfiguration {
}
// Default settings
}
// Default settings
-const DEFAULT_GUI_PORT = 838
4
;
+const DEFAULT_GUI_PORT = 838
6
;
const DEFAULT_GUI_API_KEY = "1234abcezam";
const DEFAULT_RESCAN_INTERV = 0; // 0: use syncthing-inotify to detect changes
const DEFAULT_GUI_API_KEY = "1234abcezam";
const DEFAULT_RESCAN_INTERV = 0; // 0: use syncthing-inotify to detect changes