diff options
| author |  Miek Gieben <miek@miek.nl>
| 2020-09-24 18:14:41 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2020-09-24 18:14:41 +0200 |
| commit | b003d06003750e26d1621c1d6167ce63ecd824d5 (patch) | |
| tree | 364892e67a24826063c2e3a5d308b1dadbeaa8b3 /plugin/metadata | |
| parent | 24e668ecf085597faa3100f130a85c480a36c7cb (diff) | |
| download | coredns-b003d06003750e26d1621c1d6167ce63ecd824d5.tar.gz coredns-b003d06003750e26d1621c1d6167ce63ecd824d5.tar.zst coredns-b003d06003750e26d1621c1d6167ce63ecd824d5.zip | |
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 <miek@miek.nl>
* Fix imports
Signed-off-by: Miek Gieben <miek@miek.nl>
* Group coredns/caddy with out plugins
Signed-off-by: Miek Gieben <miek@miek.nl>
* remove this file
Signed-off-by: Miek Gieben <miek@miek.nl>
* 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 <miek@miek.nl>
* Fix final import
Signed-off-by: Miek Gieben <miek@miek.nl>
Diffstat (limited to 'plugin/metadata')
| -rw-r--r-- | plugin/metadata/setup.go | 3 | ||||
| -rw-r--r-- | plugin/metadata/setup_test.go | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/plugin/metadata/setup.go b/plugin/metadata/setup.go index 734ea678e..7a0985a2d 100644 --- a/plugin/metadata/setup.go +++ b/plugin/metadata/setup.go @@ -1,10 +1,9 @@ package metadata import ( + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/plugin" - - "github.com/caddyserver/caddy" ) func init() { plugin.Register("metadata", setup) } diff --git a/plugin/metadata/setup_test.go b/plugin/metadata/setup_test.go index 500d67d19..ed552f70d 100644 --- a/plugin/metadata/setup_test.go +++ b/plugin/metadata/setup_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/caddyserver/caddy" + "github.com/coredns/caddy" ) func TestSetup(t *testing.T) { |