diff options
| author |   Sebastien Douheret <sebastien.douheret@iot.bzh> | 2017-10-20 14:30:33 +0200 |
|---|---|---|
| committer | Sebastien Douheret <sebastien.douheret@iot.bzh> | 2017-10-20 14:36:43 +0200 |
| commit | 2d90eac319979dba64371258b30e61e77a15db7d (patch) | |
| tree | 3b89b5efcf4b4476852a9944a12d5c9a6e3502fd /lib | |
| parent | 77ab312b87324090ec6cb619d11f792b53fdddbd (diff) | |
| parent | 7843cfd903cf7770df81c91193068900fb563e59 (diff) | |
Merge branch 'master' into wipv0.3.0-rc1
Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/syncthing/st.go | 2 | ||||
| -rw-r--r-- | lib/xdsconfig/configfile.go | 5 |
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 { |