All middleware equal (#535)

* all-middleware-equal

* Revert "all-middleware-equal"

This reverts commit ee77b2a9816b1953a19fefb863875399aacd0c2a.

* middleware: treat external and local the same

Make the middleware generation simpler and also specify the local
middleware, meaning that it can now be removed as well. Simplify
the code a bit and regen everything.

* remove lineNR, not used

1 files changed, 27 insertions, 28 deletions

diff --git a/middleware.cfg b/middleware.cfg
index 0a9527e5c..dcec2c99a 100644
--- a/middleware.cfg
+++ b/middleware.cfg
@@ -6,39 +6,38 @@
 # (after) them during a request, but they must not
 # care what middleware above them are doing.
 
-
 # How to rebuild with updated middleware configurations:
-# Modify the list below and run `make gen && make`
+# Modify the list below and run `go gen && go build`
 
 # The parser takes the input format of
 #     <order>:<middleware-name>:<package-name>
-# OR
-#     <order>:<middleware-name>:
+# Or
+#     <order>:<middleware-name>:<fully-qualified-package-name>
+#
 # External middleware example:
 # 80:log:github.com/miekg/coredns/middleware/log
 # Local middleware example:
-# 80:log:
+# 80:log:log
 
-10:root:
-20:bind:
-30:trace:
-40:health:
-50:pprof:
-60:prometheus:
-70:errors:
-80:log:
-90:chaos:
-100:cache:
-110:rewrite:
-120:loadbalance:
-130:dnssec:
-140:file:
-150:auto:
-160:secondary:
-170:etcd:
-180:kubernetes:
-185:reverse:
-190:proxy:
-200:httpprox:
-210:whoami:
-220:erratic:
+10:root:root
+20:bind:bind
+30:trace:trace
+40:health:health
+50:pprof:pprof
+60:prometheus:metrics
+70:errors:errors
+80:log:log
+90:chaos:chaos
+100:cache:cache
+110:rewrite:rewrite
+120:loadbalance:loadbalance
+130:dnssec:dnssec
+140:file:file
+150:auto:auto
+160:secondary:secondary
+170:etcd:etcd
+180:kubernetes:kubernetes
+185:reverse:reverse
+190:proxy:proxy
+210:whoami:whoami
+220:erratic:erratic