middleware/etcd: Use the correct endpoint

The endpoint for etcd as wrongly set if a proxy was configured.
Clean up some documentation in the process as well.

9 files changed, 8 insertions, 24 deletions

diff --git a/core/setup/etcd.go b/core/setup/etcd.go
index 6cc0dcbbf..228829008 100644
--- a/core/setup/etcd.go
+++ b/core/setup/etcd.go
@@ -17,7 +17,7 @@ import (
 	"golang.org/x/net/context"
 )
 
-const defaultEndpoint = "http://127.0.0.1:2379"
+const defaultEndpoint = "http://localhost:2379"
 
 // Etcd sets up the etcd middleware.
 func Etcd(c *Controller) (middleware.Middleware, error) {
@@ -125,7 +125,6 @@ func etcdParse(c *Controller) (etcd.Etcd, bool, error) {
 								args[i] = h + ":53"
 							}
 						}
-						endpoints = args
 						etc.Proxy = proxy.New(args)
 					case "tls": // cert key cacertfile
 						args := c.RemainingArgs()
diff --git a/middleware/etcd/README.md b/middleware/etcd/README.md
index f700aece5..f70135837 100644
--- a/middleware/etcd/README.md
+++ b/middleware/etcd/README.md
@@ -15,7 +15,7 @@ etcd [zones...]
 
 * `zones` zones etcd should be authoritative for.
 
-The path will default to `/skydns` the local etcd proxy (http://127.0.0.1:2379).
+The path will default to `/skydns` the local etcd proxy (http://localhost:2379).
 If no zones are specified the block's zone will be used as the zone.
 
 If you want to `round robin` A and AAAA responses look at the `loadbalance` middleware.
@@ -45,12 +45,14 @@ This is the default SkyDNS setup, with everying specified in full:
 
 ~~~
 .:53 {
-    etcd {
+    etcd skydns.local {
         stubzones
         path /skydns
-        endpoint http://localhost:2397
+        endpoint http://localhost:2379
         upstream 8.8.8.8:53 8.8.4.4:53
     }
+    prometheus
+    cache 160 skydns.local
     loadbalance
     proxy . 8.8.8.8:53 8.8.4.4:53
 }
diff --git a/middleware/etcd/cname_test.go b/middleware/etcd/cname_test.go
index 26f872fcf..d25a18104 100644
--- a/middleware/etcd/cname_test.go
+++ b/middleware/etcd/cname_test.go
@@ -2,7 +2,7 @@
 
 package etcd
 
-// etcd needs to be running on http://127.0.0.1:2379
+// etcd needs to be running on http://localhost:2379
 
 import (
 	"testing"
diff --git a/middleware/etcd/group_test.go b/middleware/etcd/group_test.go
index 0e50e69da..ab8de9fe0 100644
--- a/middleware/etcd/group_test.go
+++ b/middleware/etcd/group_test.go
@@ -2,10 +2,6 @@
 
 package etcd
 
-// etcd needs to be running on http://127.0.0.1:2379
-// *and* needs connectivity to the internet for remotely resolving
-// names.
-
 import (
 	"sort"
 	"testing"
diff --git a/middleware/etcd/handler.go b/middleware/etcd/handler.go
index 38e1b51cd..729b049cc 100644
--- a/middleware/etcd/handler.go
+++ b/middleware/etcd/handler.go
@@ -73,6 +73,7 @@ func (e Etcd) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (i
 		return e.Err(zone, dns.RcodeNameError, state)
 	}
 	if err != nil {
+		println("returning error", err.Error())
 		return dns.RcodeServerFailure, err
 	}
 
diff --git a/middleware/etcd/lookup_test.go b/middleware/etcd/lookup_test.go
index 578c59aad..ffc8c737e 100644
--- a/middleware/etcd/lookup_test.go
+++ b/middleware/etcd/lookup_test.go
@@ -2,10 +2,6 @@
 
 package etcd
 
-// etcd needs to be running on http://127.0.0.1:2379
-// *and* needs connectivity to the internet for remotely resolving
-// names.
-
 import (
 	"github.com/miekg/coredns/middleware/etcd/msg"
 	"github.com/miekg/coredns/middleware/test"
diff --git a/middleware/etcd/multi_test.go b/middleware/etcd/multi_test.go
index 61ecc7b6a..88f8440ec 100644
--- a/middleware/etcd/multi_test.go
+++ b/middleware/etcd/multi_test.go
@@ -2,9 +2,6 @@
 
 package etcd
 
-// etcd needs to be running on http://127.0.0.1:2379
-// *and* needs connectivity to the internet for remotely resolving names.
-
 import (
 	"sort"
 	"testing"
diff --git a/middleware/etcd/other_test.go b/middleware/etcd/other_test.go
index d814e2102..fadb783a2 100644
--- a/middleware/etcd/other_test.go
+++ b/middleware/etcd/other_test.go
@@ -4,10 +4,6 @@
 
 package etcd
 
-// etcd needs to be running on http://127.0.0.1:2379
-// *and* needs connectivity to the internet for remotely resolving
-// names.
-
 import (
 	"sort"
 	"testing"
diff --git a/middleware/etcd/setup_test.go b/middleware/etcd/setup_test.go
index d61680541..b28602122 100644
--- a/middleware/etcd/setup_test.go
+++ b/middleware/etcd/setup_test.go
@@ -2,9 +2,6 @@
 
 package etcd
 
-// etcd needs to be running on http://127.0.0.1:2379
-// *and* needs connectivity to the internet for remotely resolving names.
-
 import (
 	"encoding/json"
 	"sort"