From b003d06003750e26d1621c1d6167ce63ecd824d5 Mon Sep 17 00:00:00 2001 From: Miek Gieben Date: Thu, 24 Sep 2020 18:14:41 +0200 Subject: For caddy v1 in our org (#4018) * For caddy v1 in our org This RP changes all imports for caddyserver/caddy to coredns/caddy. This is the v1 code of caddy. For the coredns/caddy repo the following changes have been made: * anything not needed by us is deleted * all `telemetry` stuff is deleted * all its import paths are also changed to point to coredns/caddy * the v1 branch has been moved to the master branch * a v1.1.0 tag has been added to signal the latest release Signed-off-by: Miek Gieben * Fix imports Signed-off-by: Miek Gieben * Group coredns/caddy with out plugins Signed-off-by: Miek Gieben * remove this file Signed-off-by: Miek Gieben * Relax import ordering github.com/coredns is now also a coredns dep, this makes github.com/coredns/caddy fit more natural in the list. Signed-off-by: Miek Gieben * Fix final import Signed-off-by: Miek Gieben --- plugin/errors/setup.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'plugin/errors/setup.go') diff --git a/plugin/errors/setup.go b/plugin/errors/setup.go index 283f3dd15..ef279dadf 100644 --- a/plugin/errors/setup.go +++ b/plugin/errors/setup.go @@ -4,10 +4,9 @@ import ( "regexp" "time" + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/plugin" - - "github.com/caddyserver/caddy" ) func init() { plugin.Register("errors", setup) } -- cgit v1.2.3