From 36c89da848adb164d01da5b7ca78c34972b8f590 Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Sat, 7 Jul 2018 12:16:55 +0100
Subject: [PATCH] Stick with tcp://localhost:9001 as default for now

---
 src/yggdrasil/config/config.go             | 2 +-
 src/yggdrasil/defaults/defaults_darwin.go  | 2 +-
 src/yggdrasil/defaults/defaults_freebsd.go | 2 +-
 src/yggdrasil/defaults/defaults_linux.go   | 2 +-
 src/yggdrasil/defaults/defaults_netbsd.go  | 2 +-
 src/yggdrasil/defaults/defaults_openbsd.go | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/yggdrasil/config/config.go b/src/yggdrasil/config/config.go
index 2b8fbe3b..5b03e237 100644
--- a/src/yggdrasil/config/config.go
+++ b/src/yggdrasil/config/config.go
@@ -3,7 +3,7 @@ package config
 // NodeConfig defines all configuration values needed to run a signle yggdrasil node
 type NodeConfig struct {
 	Listen                      string   `comment:"Listen address for peer connections. Default is to listen for all\nTCP connections over IPv4 and IPv6 with a random port."`
-	AdminListen                 string   `comment:"Listen address for admin connections Default is to listen for local\nconnections only on TCP port 9001."`
+	AdminListen                 string   `comment:"Listen address for admin connections Default is to listen for local\nconnections either on TCP/9001 or a UNIX socket depending on your\nplatform. Use this value for yggdrasilctl -endpoint=X."`
 	Peers                       []string `comment:"List of connection strings for static peers in URI format, i.e.\ntcp://a.b.c.d:e or socks://a.b.c.d:e/f.g.h.i:j"`
 	AllowedEncryptionPublicKeys []string `comment:"List of peer encryption public keys to allow or incoming TCP\nconnections from. If left empty/undefined then all connections\nwill be allowed by default."`
 	EncryptionPublicKey         string   `comment:"Your public encryption key. Your peers may ask you for this to put\ninto their AllowedEncryptionPublicKeys configuration."`
diff --git a/src/yggdrasil/defaults/defaults_darwin.go b/src/yggdrasil/defaults/defaults_darwin.go
index b82660fa..3a88274d 100644
--- a/src/yggdrasil/defaults/defaults_darwin.go
+++ b/src/yggdrasil/defaults/defaults_darwin.go
@@ -7,7 +7,7 @@ package defaults
 func GetDefaults() platformDefaultParameters {
 	return platformDefaultParameters{
     // Admin
-		DefaultAdminListen: "unix:///var/run/yggdrasil.sock",
+		DefaultAdminListen: "tcp://localhost:9001",
 
     // TUN/TAP
     MaximumIfMTU:     65535,
diff --git a/src/yggdrasil/defaults/defaults_freebsd.go b/src/yggdrasil/defaults/defaults_freebsd.go
index 4ba7face..7c5c7752 100644
--- a/src/yggdrasil/defaults/defaults_freebsd.go
+++ b/src/yggdrasil/defaults/defaults_freebsd.go
@@ -7,7 +7,7 @@ package defaults
 func GetDefaults() platformDefaultParameters {
 	return platformDefaultParameters{
 		// Admin
-		DefaultAdminListen: "unix:///var/run/yggdrasil.sock",
+		DefaultAdminListen: "tcp://localhost:9001",
 
 		// TUN/TAP
 		MaximumIfMTU:     32767,
diff --git a/src/yggdrasil/defaults/defaults_linux.go b/src/yggdrasil/defaults/defaults_linux.go
index 4572f3c1..2c54d0fc 100644
--- a/src/yggdrasil/defaults/defaults_linux.go
+++ b/src/yggdrasil/defaults/defaults_linux.go
@@ -7,7 +7,7 @@ package defaults
 func GetDefaults() platformDefaultParameters {
 	return platformDefaultParameters{
     // Admin
-		DefaultAdminListen: "unix:///var/run/yggdrasil.sock",
+		DefaultAdminListen: "tcp://localhost:9001",
 
     // TUN/TAP
     MaximumIfMTU:     65535,
diff --git a/src/yggdrasil/defaults/defaults_netbsd.go b/src/yggdrasil/defaults/defaults_netbsd.go
index d9f3b4d3..64dd5b05 100644
--- a/src/yggdrasil/defaults/defaults_netbsd.go
+++ b/src/yggdrasil/defaults/defaults_netbsd.go
@@ -7,7 +7,7 @@ package defaults
 func GetDefaults() platformDefaultParameters {
 	return platformDefaultParameters{
 		// Admin
-		DefaultAdminListen: "unix:///var/run/yggdrasil.sock",
+		DefaultAdminListen: "tcp://localhost:9001",
 
 		// TUN/TAP
 		MaximumIfMTU:     9000,
diff --git a/src/yggdrasil/defaults/defaults_openbsd.go b/src/yggdrasil/defaults/defaults_openbsd.go
index 1b3e0c07..1e9e28c2 100644
--- a/src/yggdrasil/defaults/defaults_openbsd.go
+++ b/src/yggdrasil/defaults/defaults_openbsd.go
@@ -7,7 +7,7 @@ package defaults
 func GetDefaults() platformDefaultParameters {
 	return platformDefaultParameters{
 		// Admin
-		DefaultAdminListen: "unix:///var/run/yggdrasil.sock",
+		DefaultAdminListen: "tcp://localhost:9001",
 
 		// TUN/TAP
 		MaximumIfMTU:     16384,