Update Caddy to 1.0.1, and update import path (#2961)

* Update Caddy to 1.0.1, and update import path

This fix updates caddy to 1.0.1 and also
updates the import path to github.com/caddyserver/caddy

This fix fixes 2959

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>

* Also update plugin.cfg

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>

* Update and bump zplugin.go

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>

92 files changed, 96 insertions, 96 deletions

diff --git a/plugin/any/setup.go b/plugin/any/setup.go
index de4697a82..f2d709e26 100644
--- a/plugin/any/setup.go
+++ b/plugin/any/setup.go
@@ -4,7 +4,7 @@ import (
 	"github.com/coredns/coredns/core/dnsserver"
 	"github.com/coredns/coredns/plugin"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func init() {
diff --git a/plugin/auto/setup.go b/plugin/auto/setup.go
index 96e15bffe..f62aa7168 100644
--- a/plugin/auto/setup.go
+++ b/plugin/auto/setup.go
@@ -13,7 +13,7 @@ import (
 	"github.com/coredns/coredns/plugin/pkg/parse"
 	"github.com/coredns/coredns/plugin/pkg/upstream"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 var log = clog.NewWithPlugin("auto")
diff --git a/plugin/auto/setup_test.go b/plugin/auto/setup_test.go
index a9b5faff7..528dce23b 100644
--- a/plugin/auto/setup_test.go
+++ b/plugin/auto/setup_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func TestAutoParse(t *testing.T) {
diff --git a/plugin/autopath/setup.go b/plugin/autopath/setup.go
index 4dbe139ca..2f69a3eb2 100644
--- a/plugin/autopath/setup.go
+++ b/plugin/autopath/setup.go
@@ -7,7 +7,7 @@ import (
 	"github.com/coredns/coredns/plugin"
 	"github.com/coredns/coredns/plugin/metrics"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 	"github.com/miekg/dns"
 )
 
diff --git a/plugin/autopath/setup_test.go b/plugin/autopath/setup_test.go
index 530036934..cce855049 100644
--- a/plugin/autopath/setup_test.go
+++ b/plugin/autopath/setup_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/coredns/coredns/plugin/test"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func TestSetupAutoPath(t *testing.T) {
diff --git a/plugin/bind/bind.go b/plugin/bind/bind.go
index c4a1306db..749561a36 100644
--- a/plugin/bind/bind.go
+++ b/plugin/bind/bind.go
@@ -1,7 +1,7 @@
 // Package bind allows binding to a specific interface instead of bind to all of them.
 package bind
 
-import "github.com/mholt/caddy"
+import "github.com/caddyserver/caddy"
 
 func init() {
 	caddy.RegisterPlugin("bind", caddy.Plugin{
diff --git a/plugin/bind/setup.go b/plugin/bind/setup.go
index e487855c9..84466eb67 100644
--- a/plugin/bind/setup.go
+++ b/plugin/bind/setup.go
@@ -7,7 +7,7 @@ import (
 	"github.com/coredns/coredns/core/dnsserver"
 	"github.com/coredns/coredns/plugin"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func setup(c *caddy.Controller) error {
diff --git a/plugin/bind/setup_test.go b/plugin/bind/setup_test.go
index ede4efac0..1d85e9562 100644
--- a/plugin/bind/setup_test.go
+++ b/plugin/bind/setup_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/coredns/coredns/core/dnsserver"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func TestSetup(t *testing.T) {
diff --git a/plugin/cache/setup.go b/plugin/cache/setup.go
index d6052b162..3bffe8581 100644
--- a/plugin/cache/setup.go
+++ b/plugin/cache/setup.go
@@ -11,7 +11,7 @@ import (
 	"github.com/coredns/coredns/plugin/pkg/cache"
 	clog "github.com/coredns/coredns/plugin/pkg/log"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 var log = clog.NewWithPlugin("cache")
diff --git a/plugin/cache/setup_test.go b/plugin/cache/setup_test.go
index bc1c163d1..975520d31 100644
--- a/plugin/cache/setup_test.go
+++ b/plugin/cache/setup_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func TestSetup(t *testing.T) {
diff --git a/plugin/cancel/cancel.go b/plugin/cancel/cancel.go
index 68df153d9..10efabfea 100644
--- a/plugin/cancel/cancel.go
+++ b/plugin/cancel/cancel.go
@@ -9,7 +9,7 @@ import (
 	"github.com/coredns/coredns/core/dnsserver"
 	"github.com/coredns/coredns/plugin"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 	"github.com/miekg/dns"
 )
 
diff --git a/plugin/cancel/setup_test.go b/plugin/cancel/setup_test.go
index 64ae486a2..d79390254 100644
--- a/plugin/cancel/setup_test.go
+++ b/plugin/cancel/setup_test.go
@@ -3,7 +3,7 @@ package cancel
 import (
 	"testing"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func TestSetup(t *testing.T) {
diff --git a/plugin/chaos/setup.go b/plugin/chaos/setup.go
index 6cf5e09da..33eba8a50 100644
--- a/plugin/chaos/setup.go
+++ b/plugin/chaos/setup.go
@@ -8,7 +8,7 @@ import (
 	"github.com/coredns/coredns/core/dnsserver"
 	"github.com/coredns/coredns/plugin"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func init() {
diff --git a/plugin/chaos/setup_test.go b/plugin/chaos/setup_test.go
index b5cab4d29..647d63f6c 100644
--- a/plugin/chaos/setup_test.go
+++ b/plugin/chaos/setup_test.go
@@ -4,7 +4,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func TestSetupChaos(t *testing.T) {
diff --git a/plugin/chaos/zowners.go b/plugin/chaos/zowners.go
index d747069dc..7d5f296ca 100644
--- a/plugin/chaos/zowners.go
+++ b/plugin/chaos/zowners.go
@@ -1,4 +1,4 @@
 package chaos
 
 // Owners are all GitHub handlers of all maintainers.
-var Owners = []string{"bradbeam", "chrisohaver", "dilyevsky", "ekleiner", "fastest963", "greenpau", "grobie", "inigohu", "isolus", "johnbelamaric", "miekg", "nchrisdk", "nitisht", "pmoroney", "rajansandeep", "rdrozhdzh", "rtreffer", "stp-ip", "superq", "varyoo", "yongtang"}
+var Owners = []string{"bradbeam", "chrisohaver", "dilyevsky", "ekleiner", "fastest963", "greenpau", "grobie", "inigohu", "isolus", "johnbelamaric", "miekg", "nchrisdk", "nitisht", "pmoroney", "rajansandeep", "rdrozhdzh", "rtreffer", "stp-ip", "superq", "varyoo", "yongtang"}
\ No newline at end of file
diff --git a/plugin/debug/debug.go b/plugin/debug/debug.go
index d69ce0e55..225e5f422 100644
--- a/plugin/debug/debug.go
+++ b/plugin/debug/debug.go
@@ -4,7 +4,7 @@ import (
 	"github.com/coredns/coredns/core/dnsserver"
 	"github.com/coredns/coredns/plugin"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func init() {
diff --git a/plugin/debug/debug_test.go b/plugin/debug/debug_test.go
index 45ea42661..8e1dcd9cd 100644
--- a/plugin/debug/debug_test.go
+++ b/plugin/debug/debug_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/coredns/coredns/core/dnsserver"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func TestDebug(t *testing.T) {
diff --git a/plugin/deprecated/setup.go b/plugin/deprecated/setup.go
index 566e266ec..36c13bdb6 100644
--- a/plugin/deprecated/setup.go
+++ b/plugin/deprecated/setup.go
@@ -1,6 +1,6 @@
 // Package deprecated is used when we deprecated plugin. In plugin.cfg just go from
 //
-// startup:github.com/mholt/caddy/startupshutdown
+// startup:github.com/caddyserver/caddy/startupshutdown
 //
 // To:
 //
@@ -16,7 +16,7 @@ import (
 
 	"github.com/coredns/coredns/plugin"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 // removed has the names of the plugins that need to error on startup.
diff --git a/plugin/dnssec/setup.go b/plugin/dnssec/setup.go
index df7e54b70..54a2390fd 100644
--- a/plugin/dnssec/setup.go
+++ b/plugin/dnssec/setup.go
@@ -12,7 +12,7 @@ import (
 	"github.com/coredns/coredns/plugin/pkg/cache"
 	clog "github.com/coredns/coredns/plugin/pkg/log"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 var log = clog.NewWithPlugin("dnssec")
diff --git a/plugin/dnssec/setup_test.go b/plugin/dnssec/setup_test.go
index 1ca515f02..ab58cc0a4 100644
--- a/plugin/dnssec/setup_test.go
+++ b/plugin/dnssec/setup_test.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func TestSetupDnssec(t *testing.T) {
diff --git a/plugin/dnstap/setup.go b/plugin/dnstap/setup.go
index 70896722a..c9595ec73 100644
--- a/plugin/dnstap/setup.go
+++ b/plugin/dnstap/setup.go
@@ -9,8 +9,8 @@ import (
 	clog "github.com/coredns/coredns/plugin/pkg/log"
 	"github.com/coredns/coredns/plugin/pkg/parse"
 
-	"github.com/mholt/caddy"
-	"github.com/mholt/caddy/caddyfile"
+	"github.com/caddyserver/caddy"
+	"github.com/caddyserver/caddy/caddyfile"
 )
 
 var log = clog.NewWithPlugin("dnstap")
diff --git a/plugin/dnstap/setup_test.go b/plugin/dnstap/setup_test.go
index a3f8bb3e6..eef941d89 100644
--- a/plugin/dnstap/setup_test.go
+++ b/plugin/dnstap/setup_test.go
@@ -3,7 +3,7 @@ package dnstap
 import (
 	"testing"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func TestConfig(t *testing.T) {
diff --git a/plugin/erratic/setup.go b/plugin/erratic/setup.go
index 79e4449ee..98ac4f0c2 100644
--- a/plugin/erratic/setup.go
+++ b/plugin/erratic/setup.go
@@ -8,7 +8,7 @@ import (
 	"github.com/coredns/coredns/core/dnsserver"
 	"github.com/coredns/coredns/plugin"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func init() {
diff --git a/plugin/erratic/setup_test.go b/plugin/erratic/setup_test.go
index 4ff9bacd2..54e98cf82 100644
--- a/plugin/erratic/setup_test.go
+++ b/plugin/erratic/setup_test.go
@@ -3,7 +3,7 @@ package erratic
 import (
 	"testing"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func TestSetup(t *testing.T) {
diff --git a/plugin/errors/setup.go b/plugin/errors/setup.go
index 42a5a40f5..a196d220f 100644
--- a/plugin/errors/setup.go
+++ b/plugin/errors/setup.go
@@ -7,7 +7,7 @@ import (
 	"github.com/coredns/coredns/core/dnsserver"
 	"github.com/coredns/coredns/plugin"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func init() {
diff --git a/plugin/errors/setup_test.go b/plugin/errors/setup_test.go
index 3305f6823..54ee3512a 100644
--- a/plugin/errors/setup_test.go
+++ b/plugin/errors/setup_test.go
@@ -3,7 +3,7 @@ package errors
 import (
 	"testing"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func TestErrorsParse(t *testing.T) {
diff --git a/plugin/etcd/setup.go b/plugin/etcd/setup.go
index 1ac00c45b..010833bbc 100644
--- a/plugin/etcd/setup.go
+++ b/plugin/etcd/setup.go
@@ -10,7 +10,7 @@ import (
 	"github.com/coredns/coredns/plugin/pkg/upstream"
 
 	etcdcv3 "github.com/coreos/etcd/clientv3"
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 var log = clog.NewWithPlugin("etcd")
diff --git a/plugin/etcd/setup_test.go b/plugin/etcd/setup_test.go
index 40a22cafe..20379628b 100644
--- a/plugin/etcd/setup_test.go
+++ b/plugin/etcd/setup_test.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func TestSetupEtcd(t *testing.T) {
diff --git a/plugin/federation/setup.go b/plugin/federation/setup.go
index 274219acb..fde50853d 100644
--- a/plugin/federation/setup.go
+++ b/plugin/federation/setup.go
@@ -9,7 +9,7 @@ import (
 	"github.com/coredns/coredns/plugin/pkg/upstream"
 	"github.com/miekg/dns"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func init() {
diff --git a/plugin/federation/setup_test.go b/plugin/federation/setup_test.go
index e85b01772..6aed5cce7 100644
--- a/plugin/federation/setup_test.go
+++ b/plugin/federation/setup_test.go
@@ -3,7 +3,7 @@ package federation
 import (
 	"testing"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func TestSetup(t *testing.T) {
diff --git a/plugin/file/setup.go b/plugin/file/setup.go
index 53f527a0d..38ba79621 100644
--- a/plugin/file/setup.go
+++ b/plugin/file/setup.go
@@ -10,7 +10,7 @@ import (
 	"github.com/coredns/coredns/plugin/pkg/parse"
 	"github.com/coredns/coredns/plugin/pkg/upstream"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func init() {
diff --git a/plugin/file/setup_test.go b/plugin/file/setup_test.go
index ceb27f8b4..f6252759b 100644
--- a/plugin/file/setup_test.go
+++ b/plugin/file/setup_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/coredns/coredns/plugin/test"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func TestFileParse(t *testing.T) {
diff --git a/plugin/forward/proxy_test.go b/plugin/forward/proxy_test.go
index 794103516..7075e1133 100644
--- a/plugin/forward/proxy_test.go
+++ b/plugin/forward/proxy_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/coredns/coredns/plugin/test"
 	"github.com/coredns/coredns/request"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 	"github.com/miekg/dns"
 )
 
diff --git a/plugin/forward/setup.go b/plugin/forward/setup.go
index 23d9acfed..d084d6118 100644
--- a/plugin/forward/setup.go
+++ b/plugin/forward/setup.go
@@ -12,8 +12,8 @@ import (
 	pkgtls "github.com/coredns/coredns/plugin/pkg/tls"
 	"github.com/coredns/coredns/plugin/pkg/transport"
 
-	"github.com/mholt/caddy"
-	"github.com/mholt/caddy/caddyfile"
+	"github.com/caddyserver/caddy"
+	"github.com/caddyserver/caddy/caddyfile"
 )
 
 func init() {
diff --git a/plugin/forward/setup_policy_test.go b/plugin/forward/setup_policy_test.go
index 986f3aa01..0163e61c0 100644
--- a/plugin/forward/setup_policy_test.go
+++ b/plugin/forward/setup_policy_test.go
@@ -4,7 +4,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func TestSetupPolicy(t *testing.T) {
diff --git a/plugin/forward/setup_test.go b/plugin/forward/setup_test.go
index 0875560bb..ae0c991d9 100644
--- a/plugin/forward/setup_test.go
+++ b/plugin/forward/setup_test.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func TestSetup(t *testing.T) {
diff --git a/plugin/grpc/setup.go b/plugin/grpc/setup.go
index 8d8a8453f..aecef9d83 100644
--- a/plugin/grpc/setup.go
+++ b/plugin/grpc/setup.go
@@ -10,8 +10,8 @@ import (
 	"github.com/coredns/coredns/plugin/pkg/parse"
 	pkgtls "github.com/coredns/coredns/plugin/pkg/tls"
 
-	"github.com/mholt/caddy"
-	"github.com/mholt/caddy/caddyfile"
+	"github.com/caddyserver/caddy"
+	"github.com/caddyserver/caddy/caddyfile"
 )
 
 func init() {
diff --git a/plugin/grpc/setup_policy_test.go b/plugin/grpc/setup_policy_test.go
index db7da6262..85f20e95c 100644
--- a/plugin/grpc/setup_policy_test.go
+++ b/plugin/grpc/setup_policy_test.go
@@ -4,7 +4,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func TestSetupPolicy(t *testing.T) {
diff --git a/plugin/grpc/setup_test.go b/plugin/grpc/setup_test.go
index 8ec878b7d..6a6646292 100644
--- a/plugin/grpc/setup_test.go
+++ b/plugin/grpc/setup_test.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func TestSetup(t *testing.T) {
diff --git a/plugin/health/setup.go b/plugin/health/setup.go
index 11d498b09..75e35d8e6 100644
--- a/plugin/health/setup.go
+++ b/plugin/health/setup.go
@@ -8,7 +8,7 @@ import (
 	"github.com/coredns/coredns/plugin"
 	"github.com/coredns/coredns/plugin/metrics"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func init() {
diff --git a/plugin/health/setup_test.go b/plugin/health/setup_test.go
index 35dc15509..f570d803d 100644
--- a/plugin/health/setup_test.go
+++ b/plugin/health/setup_test.go
@@ -3,7 +3,7 @@ package health
 import (
 	"testing"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func TestSetupHealth(t *testing.T) {
diff --git a/plugin/hosts/setup.go b/plugin/hosts/setup.go
index 945a53dfd..26c3c82d3 100644
--- a/plugin/hosts/setup.go
+++ b/plugin/hosts/setup.go
@@ -11,7 +11,7 @@ import (
 	"github.com/coredns/coredns/plugin"
 	clog "github.com/coredns/coredns/plugin/pkg/log"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 var log = clog.NewWithPlugin("hosts")
diff --git a/plugin/hosts/setup_test.go b/plugin/hosts/setup_test.go
index 78b1cff86..0e3800112 100644
--- a/plugin/hosts/setup_test.go
+++ b/plugin/hosts/setup_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/coredns/coredns/plugin/pkg/fall"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func TestHostsParse(t *testing.T) {
diff --git a/plugin/k8s_external/setup.go b/plugin/k8s_external/setup.go
index ede34c6ce..ed645c0c8 100644
--- a/plugin/k8s_external/setup.go
+++ b/plugin/k8s_external/setup.go
@@ -6,7 +6,7 @@ import (
 	"github.com/coredns/coredns/core/dnsserver"
 	"github.com/coredns/coredns/plugin"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func init() {
diff --git a/plugin/k8s_external/setup_test.go b/plugin/k8s_external/setup_test.go
index 4533e13ec..82ee243ee 100644
--- a/plugin/k8s_external/setup_test.go
+++ b/plugin/k8s_external/setup_test.go
@@ -3,7 +3,7 @@ package external
 import (
 	"testing"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func TestSetup(t *testing.T) {
diff --git a/plugin/kubernetes/setup.go b/plugin/kubernetes/setup.go
index 1180d0135..028f4ae77 100644
--- a/plugin/kubernetes/setup.go
+++ b/plugin/kubernetes/setup.go
@@ -16,7 +16,7 @@ import (
 	"github.com/coredns/coredns/plugin/pkg/parse"
 	"github.com/coredns/coredns/plugin/pkg/upstream"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 	"github.com/miekg/dns"
 	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
 
diff --git a/plugin/kubernetes/setup_reverse_test.go b/plugin/kubernetes/setup_reverse_test.go
index a2c69d96d..50fefb062 100644
--- a/plugin/kubernetes/setup_reverse_test.go
+++ b/plugin/kubernetes/setup_reverse_test.go
@@ -3,7 +3,7 @@ package kubernetes
 import (
 	"testing"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func TestKubernetesParseReverseZone(t *testing.T) {
diff --git a/plugin/kubernetes/setup_test.go b/plugin/kubernetes/setup_test.go
index 9dcf0f6a3..fc09f0476 100644
--- a/plugin/kubernetes/setup_test.go
+++ b/plugin/kubernetes/setup_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/coredns/coredns/plugin/pkg/fall"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
diff --git a/plugin/kubernetes/setup_transfer_test.go b/plugin/kubernetes/setup_transfer_test.go
index 6a375b69f..fce4e10c5 100644
--- a/plugin/kubernetes/setup_transfer_test.go
+++ b/plugin/kubernetes/setup_transfer_test.go
@@ -3,7 +3,7 @@ package kubernetes
 import (
 	"testing"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func TestKubernetesParseTransfer(t *testing.T) {
diff --git a/plugin/kubernetes/setup_ttl_test.go b/plugin/kubernetes/setup_ttl_test.go
index e923c7846..c4a001302 100644
--- a/plugin/kubernetes/setup_ttl_test.go
+++ b/plugin/kubernetes/setup_ttl_test.go
@@ -3,7 +3,7 @@ package kubernetes
 import (
 	"testing"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func TestKubernetesParseTTL(t *testing.T) {
diff --git a/plugin/loadbalance/setup.go b/plugin/loadbalance/setup.go
index 9d52a3cbe..c31fc15e1 100644
--- a/plugin/loadbalance/setup.go
+++ b/plugin/loadbalance/setup.go
@@ -7,7 +7,7 @@ import (
 	"github.com/coredns/coredns/plugin"
 	clog "github.com/coredns/coredns/plugin/pkg/log"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 var log = clog.NewWithPlugin("loadbalance")
diff --git a/plugin/loadbalance/setup_test.go b/plugin/loadbalance/setup_test.go
index 67673a72c..f33dcd337 100644
--- a/plugin/loadbalance/setup_test.go
+++ b/plugin/loadbalance/setup_test.go
@@ -4,7 +4,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func TestSetup(t *testing.T) {
diff --git a/plugin/log/setup.go b/plugin/log/setup.go
index be3256704..2e89d1f81 100644
--- a/plugin/log/setup.go
+++ b/plugin/log/setup.go
@@ -8,7 +8,7 @@ import (
 	"github.com/coredns/coredns/plugin/pkg/replacer"
 	"github.com/coredns/coredns/plugin/pkg/response"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 	"github.com/miekg/dns"
 )
 
diff --git a/plugin/log/setup_test.go b/plugin/log/setup_test.go
index 64f291445..aac1ebf40 100644
--- a/plugin/log/setup_test.go
+++ b/plugin/log/setup_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/coredns/coredns/plugin/pkg/response"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func TestLogParse(t *testing.T) {
diff --git a/plugin/loop/setup.go b/plugin/loop/setup.go
index db6821341..30f1a2527 100644
--- a/plugin/loop/setup.go
+++ b/plugin/loop/setup.go
@@ -10,7 +10,7 @@ import (
 	"github.com/coredns/coredns/plugin"
 	"github.com/coredns/coredns/plugin/pkg/dnsutil"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func init() {
diff --git a/plugin/loop/setup_test.go b/plugin/loop/setup_test.go
index 2a3c6846f..5a7386998 100644
--- a/plugin/loop/setup_test.go
+++ b/plugin/loop/setup_test.go
@@ -3,7 +3,7 @@ package loop
 import (
 	"testing"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func TestSetup(t *testing.T) {
diff --git a/plugin/metadata/setup.go b/plugin/metadata/setup.go
index 282bcf7d9..665216ea8 100644
--- a/plugin/metadata/setup.go
+++ b/plugin/metadata/setup.go
@@ -4,7 +4,7 @@ import (
 	"github.com/coredns/coredns/core/dnsserver"
 	"github.com/coredns/coredns/plugin"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func init() {
diff --git a/plugin/metadata/setup_test.go b/plugin/metadata/setup_test.go
index 362a1bbf3..500d67d19 100644
--- a/plugin/metadata/setup_test.go
+++ b/plugin/metadata/setup_test.go
@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func TestSetup(t *testing.T) {
diff --git a/plugin/metrics/register.go b/plugin/metrics/register.go
index ea2b45863..704192ffb 100644
--- a/plugin/metrics/register.go
+++ b/plugin/metrics/register.go
@@ -3,7 +3,7 @@ package metrics
 import (
 	"github.com/coredns/coredns/core/dnsserver"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
diff --git a/plugin/metrics/setup.go b/plugin/metrics/setup.go
index 2f566aea6..744db7cd3 100644
--- a/plugin/metrics/setup.go
+++ b/plugin/metrics/setup.go
@@ -11,7 +11,7 @@ import (
 	clog "github.com/coredns/coredns/plugin/pkg/log"
 	"github.com/coredns/coredns/plugin/pkg/uniq"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 var (
diff --git a/plugin/metrics/setup_test.go b/plugin/metrics/setup_test.go
index 43949fdd3..a0c1fe8d1 100644
--- a/plugin/metrics/setup_test.go
+++ b/plugin/metrics/setup_test.go
@@ -3,7 +3,7 @@ package metrics
 import (
 	"testing"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func TestPrometheusParse(t *testing.T) {
diff --git a/plugin/nsid/setup.go b/plugin/nsid/setup.go
index e6c5c5ae9..c851c7d20 100644
--- a/plugin/nsid/setup.go
+++ b/plugin/nsid/setup.go
@@ -7,7 +7,7 @@ import (
 	"github.com/coredns/coredns/core/dnsserver"
 	"github.com/coredns/coredns/plugin"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func init() {
diff --git a/plugin/nsid/setup_test.go b/plugin/nsid/setup_test.go
index 059b05bb5..62a27fca2 100644
--- a/plugin/nsid/setup_test.go
+++ b/plugin/nsid/setup_test.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func TestSetupNsid(t *testing.T) {
diff --git a/plugin/pkg/parse/parse.go b/plugin/pkg/parse/parse.go
index 17fe75fb0..232e163fd 100644
--- a/plugin/pkg/parse/parse.go
+++ b/plugin/pkg/parse/parse.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/coredns/coredns/plugin/pkg/transport"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 // Transfer parses transfer statements: 'transfer [to|from] [address...]'.
diff --git a/plugin/pkg/parse/parse_test.go b/plugin/pkg/parse/parse_test.go
index b1aa3730f..a9f947a7d 100644
--- a/plugin/pkg/parse/parse_test.go
+++ b/plugin/pkg/parse/parse_test.go
@@ -3,7 +3,7 @@ package parse
 import (
 	"testing"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func TestTransfer(t *testing.T) {
diff --git a/plugin/pprof/setup.go b/plugin/pprof/setup.go
index 66c147e78..175a16011 100644
--- a/plugin/pprof/setup.go
+++ b/plugin/pprof/setup.go
@@ -8,7 +8,7 @@ import (
 	"github.com/coredns/coredns/plugin"
 	clog "github.com/coredns/coredns/plugin/pkg/log"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 var log = clog.NewWithPlugin("pprof")
diff --git a/plugin/pprof/setup_test.go b/plugin/pprof/setup_test.go
index 0ad6c2c81..9c9fafec4 100644
--- a/plugin/pprof/setup_test.go
+++ b/plugin/pprof/setup_test.go
@@ -3,7 +3,7 @@ package pprof
 import (
 	"testing"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func TestPProf(t *testing.T) {
diff --git a/plugin/ready/setup.go b/plugin/ready/setup.go
index 7cf286b3d..eb1e1a8a4 100644
--- a/plugin/ready/setup.go
+++ b/plugin/ready/setup.go
@@ -6,7 +6,7 @@ import (
 	"github.com/coredns/coredns/core/dnsserver"
 	"github.com/coredns/coredns/plugin"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func init() {
diff --git a/plugin/ready/setup_test.go b/plugin/ready/setup_test.go
index 99420b9c6..7016e79d1 100644
--- a/plugin/ready/setup_test.go
+++ b/plugin/ready/setup_test.go
@@ -3,7 +3,7 @@ package ready
 import (
 	"testing"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func TestSetupReady(t *testing.T) {
diff --git a/plugin/reload/reload.go b/plugin/reload/reload.go
index 7070218e9..f6e676d88 100644
--- a/plugin/reload/reload.go
+++ b/plugin/reload/reload.go
@@ -5,7 +5,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 // reload periodically checks if the Corefile has changed, and reloads if so
diff --git a/plugin/reload/setup.go b/plugin/reload/setup.go
index ed4d9f85d..b52afe560 100644
--- a/plugin/reload/setup.go
+++ b/plugin/reload/setup.go
@@ -9,7 +9,7 @@ import (
 	"github.com/coredns/coredns/plugin"
 	clog "github.com/coredns/coredns/plugin/pkg/log"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 var log = clog.NewWithPlugin("reload")
diff --git a/plugin/reload/setup_test.go b/plugin/reload/setup_test.go
index a647cd2a6..b7f3b5cca 100644
--- a/plugin/reload/setup_test.go
+++ b/plugin/reload/setup_test.go
@@ -3,7 +3,7 @@ package reload
 import (
 	"testing"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func TestSetupReload(t *testing.T) {
diff --git a/plugin/rewrite/fuzz.go b/plugin/rewrite/fuzz.go
index 6de5f12ca..043a4a5c9 100644
--- a/plugin/rewrite/fuzz.go
+++ b/plugin/rewrite/fuzz.go
@@ -5,7 +5,7 @@ package rewrite
 import (
 	"github.com/coredns/coredns/plugin/pkg/fuzz"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 // Fuzz fuzzes rewrite.
diff --git a/plugin/rewrite/setup.go b/plugin/rewrite/setup.go
index 4d75c99f8..00c0a2f2c 100644
--- a/plugin/rewrite/setup.go
+++ b/plugin/rewrite/setup.go
@@ -5,7 +5,7 @@ import (
 	"github.com/coredns/coredns/plugin"
 	clog "github.com/coredns/coredns/plugin/pkg/log"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 var log = clog.NewWithPlugin("rewrite")
diff --git a/plugin/rewrite/setup_test.go b/plugin/rewrite/setup_test.go
index a8a8349b4..ece0a7f06 100644
--- a/plugin/rewrite/setup_test.go
+++ b/plugin/rewrite/setup_test.go
@@ -4,7 +4,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func TestParse(t *testing.T) {
diff --git a/plugin/root/root.go b/plugin/root/root.go
index 6b73cfb27..15cc45626 100644
--- a/plugin/root/root.go
+++ b/plugin/root/root.go
@@ -7,7 +7,7 @@ import (
 	"github.com/coredns/coredns/plugin"
 	clog "github.com/coredns/coredns/plugin/pkg/log"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 var log = clog.NewWithPlugin("root")
diff --git a/plugin/root/root_test.go b/plugin/root/root_test.go
index 3b4a4df04..3f2a786c0 100644
--- a/plugin/root/root_test.go
+++ b/plugin/root/root_test.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/coredns/coredns/core/dnsserver"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func TestRoot(t *testing.T) {
diff --git a/plugin/route53/setup.go b/plugin/route53/setup.go
index 5c80a5ac9..adc2b3e00 100644
--- a/plugin/route53/setup.go
+++ b/plugin/route53/setup.go
@@ -15,7 +15,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/route53"
 	"github.com/aws/aws-sdk-go/service/route53/route53iface"
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 var log = clog.NewWithPlugin("route53")
diff --git a/plugin/route53/setup_test.go b/plugin/route53/setup_test.go
index 63591f2f7..3e827eb58 100644
--- a/plugin/route53/setup_test.go
+++ b/plugin/route53/setup_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws/credentials"
 	"github.com/aws/aws-sdk-go/service/route53/route53iface"
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func TestSetupRoute53(t *testing.T) {
diff --git a/plugin/secondary/setup.go b/plugin/secondary/setup.go
index 97800258b..401b2af74 100644
--- a/plugin/secondary/setup.go
+++ b/plugin/secondary/setup.go
@@ -7,7 +7,7 @@ import (
 	"github.com/coredns/coredns/plugin/pkg/parse"
 	"github.com/coredns/coredns/plugin/pkg/upstream"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func init() {
diff --git a/plugin/secondary/setup_test.go b/plugin/secondary/setup_test.go
index bf2b203ad..47c8abac9 100644
--- a/plugin/secondary/setup_test.go
+++ b/plugin/secondary/setup_test.go
@@ -3,7 +3,7 @@ package secondary
 import (
 	"testing"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func TestSecondaryParse(t *testing.T) {
diff --git a/plugin/template/metrics.go b/plugin/template/metrics.go
index d5fe0a4d7..ce6b1a6ea 100644
--- a/plugin/template/metrics.go
+++ b/plugin/template/metrics.go
@@ -4,7 +4,7 @@ import (
 	"github.com/coredns/coredns/plugin"
 	"github.com/coredns/coredns/plugin/metrics"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
diff --git a/plugin/template/setup.go b/plugin/template/setup.go
index 85968c50b..045459ef1 100644
--- a/plugin/template/setup.go
+++ b/plugin/template/setup.go
@@ -8,7 +8,7 @@ import (
 	"github.com/coredns/coredns/plugin"
 	"github.com/coredns/coredns/plugin/pkg/upstream"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 	"github.com/miekg/dns"
 )
 
diff --git a/plugin/template/setup_test.go b/plugin/template/setup_test.go
index 0ca75b303..adae1cb72 100644
--- a/plugin/template/setup_test.go
+++ b/plugin/template/setup_test.go
@@ -3,7 +3,7 @@ package template
 import (
 	"testing"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func TestSetup(t *testing.T) {
diff --git a/plugin/template/template_test.go b/plugin/template/template_test.go
index 1b8b515d8..d2869b53b 100644
--- a/plugin/template/template_test.go
+++ b/plugin/template/template_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/coredns/coredns/plugin/pkg/fall"
 	"github.com/coredns/coredns/plugin/test"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 	"github.com/miekg/dns"
 )
 
diff --git a/plugin/tls/tls.go b/plugin/tls/tls.go
index e87f802ec..3231e9381 100644
--- a/plugin/tls/tls.go
+++ b/plugin/tls/tls.go
@@ -7,7 +7,7 @@ import (
 	"github.com/coredns/coredns/plugin"
 	"github.com/coredns/coredns/plugin/pkg/tls"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func init() {
diff --git a/plugin/tls/tls_test.go b/plugin/tls/tls_test.go
index 2def130a5..f1ff8ab3e 100644
--- a/plugin/tls/tls_test.go
+++ b/plugin/tls/tls_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/coredns/coredns/core/dnsserver"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func TestTLS(t *testing.T) {
diff --git a/plugin/trace/setup.go b/plugin/trace/setup.go
index 1614cc177..87d9e7e24 100644
--- a/plugin/trace/setup.go
+++ b/plugin/trace/setup.go
@@ -8,7 +8,7 @@ import (
 	"github.com/coredns/coredns/core/dnsserver"
 	"github.com/coredns/coredns/plugin"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func init() {
diff --git a/plugin/trace/setup_test.go b/plugin/trace/setup_test.go
index 06a1b21bc..5c8d3248f 100644
--- a/plugin/trace/setup_test.go
+++ b/plugin/trace/setup_test.go
@@ -3,7 +3,7 @@ package trace
 import (
 	"testing"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func TestTraceParse(t *testing.T) {
diff --git a/plugin/trace/trace_test.go b/plugin/trace/trace_test.go
index bc43b980e..48a4d7e78 100644
--- a/plugin/trace/trace_test.go
+++ b/plugin/trace/trace_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/coredns/coredns/plugin/test"
 	"github.com/coredns/coredns/request"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 	"github.com/miekg/dns"
 	"github.com/opentracing/opentracing-go/mocktracer"
 )
diff --git a/plugin/whoami/setup.go b/plugin/whoami/setup.go
index bd4971ae9..f0ae1e6d6 100644
--- a/plugin/whoami/setup.go
+++ b/plugin/whoami/setup.go
@@ -4,7 +4,7 @@ import (
 	"github.com/coredns/coredns/core/dnsserver"
 	"github.com/coredns/coredns/plugin"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func init() {
diff --git a/plugin/whoami/setup_test.go b/plugin/whoami/setup_test.go
index c4fa58fe2..f66b007e0 100644
--- a/plugin/whoami/setup_test.go
+++ b/plugin/whoami/setup_test.go
@@ -3,7 +3,7 @@ package whoami
 import (
 	"testing"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func TestSetup(t *testing.T) {