summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/syncthing/st.go2
-rw-r--r--lib/xdsconfig/configfile.go5
2 files changed, 2 insertions, 5 deletions
diff --git a/lib/syncthing/st.go b/lib/syncthing/st.go
index 924f407..031a2ac 100644
--- a/lib/syncthing/st.go
+++ b/lib/syncthing/st.go
@@ -98,7 +98,7 @@ func NewSyncThing(conf *xdsconfig.Config, log *logrus.Logger) *SyncThing {
}
if url == "" {
- url = "http://localhost:8384"
+ url = "http://localhost:8386"
}
if url[0:7] != "http://" {
url = "http://" + url
diff --git a/lib/xdsconfig/configfile.go b/lib/xdsconfig/configfile.go
index 6eaaf6a..e3737f4 100644
--- a/lib/xdsconfig/configfile.go
+++ b/lib/xdsconfig/configfile.go
@@ -38,8 +38,7 @@ type FileConfig struct {
// Order to determine which config file is used:
// 1/ from command line option: "--config myConfig.json"
// 2/ $HOME/.xds/agent/agent-config.json file
-// 3/ <current_dir>/agent-config.json file
-// 4/ <executable dir>/agent-config.json file
+// 3/ /etc/xds-agent/config.json file
func readGlobalConfig(c *Config, confFile string) error {
@@ -53,8 +52,6 @@ func readGlobalConfig(c *Config, confFile string) error {
searchIn = append(searchIn, "/etc/xds-agent/agent-config.json")
- searchIn = append(searchIn, path.Join(common.GetExePath(), "agent-config.json"))
-
var cFile *string
for _, p := range searchIn {
if _, err := os.Stat(p); err == nil {