core: don't always include all plugins (#1135)

Clean out the imports in coredns.go and just leave the server import.

Fixes #1119

3 files changed, 2 insertions, 27 deletions

diff --git a/core/coredns.go b/core/coredns.go
index ef941aebf..0ff1dc95f 100644
--- a/core/coredns.go
+++ b/core/coredns.go
@@ -4,29 +4,4 @@ package core
 import (
 	// plug in the server
 	_ "github.com/coredns/coredns/core/dnsserver"
-
-	// plug in the standard directives (sorted)
-	_ "github.com/coredns/coredns/plugin/auto"
-	_ "github.com/coredns/coredns/plugin/bind"
-	_ "github.com/coredns/coredns/plugin/cache"
-	_ "github.com/coredns/coredns/plugin/chaos"
-	_ "github.com/coredns/coredns/plugin/dnssec"
-	_ "github.com/coredns/coredns/plugin/dnstap"
-	_ "github.com/coredns/coredns/plugin/erratic"
-	_ "github.com/coredns/coredns/plugin/errors"
-	_ "github.com/coredns/coredns/plugin/etcd"
-	_ "github.com/coredns/coredns/plugin/file"
-	_ "github.com/coredns/coredns/plugin/health"
-	_ "github.com/coredns/coredns/plugin/kubernetes"
-	_ "github.com/coredns/coredns/plugin/loadbalance"
-	_ "github.com/coredns/coredns/plugin/log"
-	_ "github.com/coredns/coredns/plugin/metrics"
-	_ "github.com/coredns/coredns/plugin/pprof"
-	_ "github.com/coredns/coredns/plugin/proxy"
-	_ "github.com/coredns/coredns/plugin/reverse"
-	_ "github.com/coredns/coredns/plugin/rewrite"
-	_ "github.com/coredns/coredns/plugin/root"
-	_ "github.com/coredns/coredns/plugin/secondary"
-	_ "github.com/coredns/coredns/plugin/trace"
-	_ "github.com/coredns/coredns/plugin/whoami"
 )
diff --git a/core/zplugin.go b/core/zplugin.go
index 522636b6a..7ec05e543 100644
--- a/core/zplugin.go
+++ b/core/zplugin.go
@@ -3,7 +3,7 @@
 package core
 
 import (
-	// Include all plugin.
+	// Include all plugins.
 	_ "github.com/coredns/coredns/plugin/auto"
 	_ "github.com/coredns/coredns/plugin/autopath"
 	_ "github.com/coredns/coredns/plugin/bind"
diff --git a/directives_generate.go b/directives_generate.go
index 8c74fa573..9c40daa8a 100644
--- a/directives_generate.go
+++ b/directives_generate.go
@@ -59,7 +59,7 @@ func genImports(file, pack string, mi map[string]string) {
 		outs += "\n"
 	}
 
-	outs += "// Include all plugin.\n"
+	outs += "// Include all plugins.\n"
 	for _, v := range mi {
 		outs += `_ "` + v + `"` + "\n"
 	}