diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/dnsserver/config.go | 3 | ||||
| -rw-r--r-- | core/dnsserver/register.go | 5 | ||||
| -rw-r--r-- | core/dnsserver/server.go | 2 | ||||
| -rw-r--r-- | core/dnsserver/server_grpc.go | 2 | ||||
| -rw-r--r-- | core/dnsserver/server_https.go | 3 | ||||
| -rw-r--r-- | core/dnsserver/server_tls.go | 2 | ||||
| -rw-r--r-- | core/plugin/zplugin.go | 2 |
7 files changed, 8 insertions, 11 deletions
diff --git a/core/dnsserver/config.go b/core/dnsserver/config.go index 0e79bd9ad..6a720ef13 100644 --- a/core/dnsserver/config.go +++ b/core/dnsserver/config.go @@ -4,9 +4,8 @@ import ( "crypto/tls" "fmt" + "github.com/coredns/caddy" "github.com/coredns/coredns/plugin" - - "github.com/caddyserver/caddy" ) // Config configuration for a single server. diff --git a/core/dnsserver/register.go b/core/dnsserver/register.go index 68087b744..b4e9f4fde 100644 --- a/core/dnsserver/register.go +++ b/core/dnsserver/register.go @@ -7,13 +7,12 @@ import ( "strings" "time" + "github.com/coredns/caddy" + "github.com/coredns/caddy/caddyfile" "github.com/coredns/coredns/plugin" "github.com/coredns/coredns/plugin/pkg/dnsutil" "github.com/coredns/coredns/plugin/pkg/parse" "github.com/coredns/coredns/plugin/pkg/transport" - - "github.com/caddyserver/caddy" - "github.com/caddyserver/caddy/caddyfile" ) const serverType = "dns" diff --git a/core/dnsserver/server.go b/core/dnsserver/server.go index 78e1d7ed6..52a2d6efc 100644 --- a/core/dnsserver/server.go +++ b/core/dnsserver/server.go @@ -10,6 +10,7 @@ import ( "sync" "time" + "github.com/coredns/caddy" "github.com/coredns/coredns/plugin" "github.com/coredns/coredns/plugin/metrics/vars" "github.com/coredns/coredns/plugin/pkg/edns" @@ -20,7 +21,6 @@ import ( "github.com/coredns/coredns/plugin/pkg/transport" "github.com/coredns/coredns/request" - "github.com/caddyserver/caddy" "github.com/miekg/dns" ot "github.com/opentracing/opentracing-go" ) diff --git a/core/dnsserver/server_grpc.go b/core/dnsserver/server_grpc.go index 11806a8d1..7873a47ad 100644 --- a/core/dnsserver/server_grpc.go +++ b/core/dnsserver/server_grpc.go @@ -7,11 +7,11 @@ import ( "fmt" "net" + "github.com/coredns/caddy" "github.com/coredns/coredns/pb" "github.com/coredns/coredns/plugin/pkg/reuseport" "github.com/coredns/coredns/plugin/pkg/transport" - "github.com/caddyserver/caddy" "github.com/grpc-ecosystem/grpc-opentracing/go/otgrpc" "github.com/miekg/dns" "github.com/opentracing/opentracing-go" diff --git a/core/dnsserver/server_https.go b/core/dnsserver/server_https.go index c19ea92d9..621bdca24 100644 --- a/core/dnsserver/server_https.go +++ b/core/dnsserver/server_https.go @@ -9,13 +9,12 @@ import ( "strconv" "time" + "github.com/coredns/caddy" "github.com/coredns/coredns/plugin/pkg/dnsutil" "github.com/coredns/coredns/plugin/pkg/doh" "github.com/coredns/coredns/plugin/pkg/response" "github.com/coredns/coredns/plugin/pkg/reuseport" "github.com/coredns/coredns/plugin/pkg/transport" - - "github.com/caddyserver/caddy" ) // ServerHTTPS represents an instance of a DNS-over-HTTPS server. diff --git a/core/dnsserver/server_tls.go b/core/dnsserver/server_tls.go index 8e7c63023..3f45e1568 100644 --- a/core/dnsserver/server_tls.go +++ b/core/dnsserver/server_tls.go @@ -6,10 +6,10 @@ import ( "fmt" "net" + "github.com/coredns/caddy" "github.com/coredns/coredns/plugin/pkg/reuseport" "github.com/coredns/coredns/plugin/pkg/transport" - "github.com/caddyserver/caddy" "github.com/miekg/dns" ) diff --git a/core/plugin/zplugin.go b/core/plugin/zplugin.go index cf83be703..102c11e97 100644 --- a/core/plugin/zplugin.go +++ b/core/plugin/zplugin.go @@ -4,7 +4,7 @@ package plugin import ( // Include all plugins. - _ "github.com/caddyserver/caddy/onevent" + _ "github.com/coredns/caddy/onevent" _ "github.com/coredns/coredns/plugin/acl" _ "github.com/coredns/coredns/plugin/any" _ "github.com/coredns/coredns/plugin/auto" |