summaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorJakob Borg <jakob@nym.se>2014-05-14 17:49:41 +0200
committerJakob Borg <jakob@nym.se>2014-05-14 17:49:41 +0200
commit81cd84add2a9f3f01dc8600b3361d588e9d4f49c (patch)
treeec3e22e111c24038fb6ed79307f76a3067e696a5 /cmd
parent76f82cbd1fb015ffe25f689acae281cd644c6ae9 (diff)
parent8229d47da5f279cc10be8266c84f479beea170b2 (diff)
Merge pull request #216 from jedie/master
Change default ListenAddress to "0.0.0.0:22000"
Diffstat (limited to 'cmd')
-rw-r--r--cmd/syncthing/config.go2
-rw-r--r--cmd/syncthing/config_test.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/cmd/syncthing/config.go b/cmd/syncthing/config.go
index ab5cae28f3..c54dd1fe7c 100644
--- a/cmd/syncthing/config.go
+++ b/cmd/syncthing/config.go
@@ -46,7 +46,7 @@ type NodeConfiguration struct {
}
type OptionsConfiguration struct {
- ListenAddress []string `xml:"listenAddress" default:":22000"`
+ ListenAddress []string `xml:"listenAddress" default:"0.0.0.0:22000"`
GlobalAnnServer string `xml:"globalAnnounceServer" default:"announce.syncthing.net:22025"`
GlobalAnnEnabled bool `xml:"globalAnnounceEnabled" default:"true"`
LocalAnnEnabled bool `xml:"localAnnounceEnabled" default:"true"`
diff --git a/cmd/syncthing/config_test.go b/cmd/syncthing/config_test.go
index 0e96b02254..91a954e755 100644
--- a/cmd/syncthing/config_test.go
+++ b/cmd/syncthing/config_test.go
@@ -10,7 +10,7 @@ import (
func TestDefaultValues(t *testing.T) {
expected := OptionsConfiguration{
- ListenAddress: []string{":22000"},
+ ListenAddress: []string{"0.0.0.0:22000"},
GlobalAnnServer: "announce.syncthing.net:22025",
GlobalAnnEnabled: true,
LocalAnnEnabled: true,