#45 Adjust caddy imports (#46)

blaubaer · web-flow · commit c90ac6e35f2d · 2019-07-08T14:40:59.000+02:00
diff --git a/filter.go b/filter.go
@@ -1,8 +1,8 @@
 package filter
 
 import (
-	"github.com/mholt/caddy/caddyhttp/fastcgi"
-	"github.com/mholt/caddy/caddyhttp/httpserver"
+	"github.com/caddyserver/caddy/caddyhttp/fastcgi"
+	"github.com/caddyserver/caddy/caddyhttp/httpserver"
 	"io"
 	"net/http"
 	"strconv"
diff --git a/filter_test.go b/filter_test.go
@@ -3,7 +3,7 @@ package filter
 import (
 	"errors"
 	"fmt"
-	"github.com/mholt/caddy/caddyhttp/fastcgi"
+	"github.com/caddyserver/caddy/caddyhttp/fastcgi"
 	. "gopkg.in/check.v1"
 	"net/http"
 	"regexp"
diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.12
 
 require (
 	github.com/NYTimes/gziphandler v1.1.1
+	github.com/caddyserver/caddy v1.0.1
 	github.com/echocat/gocheck-addons v0.0.0-20170127185256-3597b4964e95
-	github.com/mholt/caddy v1.0.0
 	gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405
 )
diff --git a/go.sum b/go.sum
@@ -4,6 +4,8 @@ github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cq
 github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c=
 github.com/bifurcation/mint v0.0.0-20180715133206-93c51c6ce115 h1:fUjoj2bT6dG8LoEe+uNsKk8J+sLkDbQkJnB6Z1F02Bc=
 github.com/bifurcation/mint v0.0.0-20180715133206-93c51c6ce115/go.mod h1:zVt7zX3K/aDCk9Tj+VM7YymsX66ERvzCJzw8rFCX2JU=
+github.com/caddyserver/caddy v1.0.1 h1:oor6ep+8NoJOabpFXhvjqjfeldtw1XSzfISVrbfqTKo=
+github.com/caddyserver/caddy v1.0.1/go.mod h1:G+ouvOY32gENkJC+jhgl62TyhvqEsFaDiZ4uw0RzP1E=
 github.com/cenkalti/backoff v2.1.1+incompatible h1:tKJnvO2kl0zmb/jA5UKAt4VoEVw1qxKWjE/Bpp46npY=
 github.com/cenkalti/backoff v2.1.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
 github.com/cheekybits/genny v0.0.0-20170328200008-9127e812e1e9 h1:a1zrFsLFac2xoM6zG1u72DWJwZG3ayttYLfmLbxVETk=
@@ -46,10 +48,8 @@ github.com/lucas-clemente/quic-go v0.10.2/go.mod h1:hvaRS9IHjFLMq76puFJeWNfmn+H7
 github.com/lucas-clemente/quic-go-certificates v0.0.0-20160823095156-d2f86524cced h1:zqEC1GJZFbGZA0tRyNZqRjep92K5fujFtFsu5ZW7Aug=
 github.com/lucas-clemente/quic-go-certificates v0.0.0-20160823095156-d2f86524cced/go.mod h1:NCcRLrOTZbzhZvixZLlERbJtDtYsmMw8Jc4vS8Z0g58=
 github.com/marten-seemann/qtls v0.2.3/go.mod h1:xzjG7avBwGGbdZ8dTGxlBnLArsVKLvwmjgmPuiQEcYk=
-github.com/mholt/caddy v1.0.0 h1:KI6RPGih2GFzWRPG8s9clKK28Ns4ZlVMKR/v7mxq6+c=
-github.com/mholt/caddy v1.0.0/go.mod h1:PzUpQ3yGCTuEuy0KSxEeB4TZOi3zBZ8BR/zY0RBP414=
-github.com/mholt/certmagic v0.5.0 h1:lYXxsLUFya/I3BgDCrfuwcMQOB+4auzI8CCzpK41tjc=
-github.com/mholt/certmagic v0.5.0/go.mod h1:g4cOPxcjV0oFq3qwpjSA30LReKD8AoIfwAY9VvG35NY=
+github.com/mholt/certmagic v0.6.2-0.20190624175158-6a42ef9fe8c2 h1:xKE9kZ5C8gelJC3+BNM6LJs1x21rivK7yxfTZMAuY2s=
+github.com/mholt/certmagic v0.6.2-0.20190624175158-6a42ef9fe8c2/go.mod h1:g4cOPxcjV0oFq3qwpjSA30LReKD8AoIfwAY9VvG35NY=
 github.com/miekg/dns v1.1.3 h1:1g0r1IvskvgL8rR+AcHzUA+oFmGcQlaIm4IqakufeMM=
 github.com/miekg/dns v1.1.3/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/naoina/go-stringutil v0.1.0 h1:rCUeRUHjBjGTSHl0VC00jUPLz8/F9dDzYI70Hzifhks=
diff --git a/init.go b/init.go
@@ -1,8 +1,8 @@
 package filter
 
 import (
-	"github.com/mholt/caddy"
-	"github.com/mholt/caddy/caddyhttp/httpserver"
+	"github.com/caddyserver/caddy"
+	"github.com/caddyserver/caddy/caddyhttp/httpserver"
 	"io/ioutil"
 	"os"
 	"regexp"
diff --git a/init_test.go b/init_test.go
@@ -2,8 +2,8 @@ package filter
 
 import (
 	"errors"
-	"github.com/mholt/caddy"
-	"github.com/mholt/caddy/caddyhttp/httpserver"
+	"github.com/caddyserver/caddy"
+	"github.com/caddyserver/caddy/caddyhttp/httpserver"
 	. "gopkg.in/check.v1"
 	"regexp"
 	"regexp/syntax"
diff --git a/integration_test.go b/integration_test.go
@@ -2,17 +2,17 @@ package filter
 
 import (
 	"fmt"
+	_ "github.com/caddyserver/caddy/caddyhttp/basicauth"
+	_ "github.com/caddyserver/caddy/caddyhttp/errors"
+	_ "github.com/caddyserver/caddy/caddyhttp/fastcgi"
+	_ "github.com/caddyserver/caddy/caddyhttp/gzip"
+	_ "github.com/caddyserver/caddy/caddyhttp/log"
+	_ "github.com/caddyserver/caddy/caddyhttp/markdown"
+	_ "github.com/caddyserver/caddy/caddyhttp/proxy"
+	_ "github.com/caddyserver/caddy/caddyhttp/redirect"
+	_ "github.com/caddyserver/caddy/caddyhttp/root"
 	"github.com/echocat/caddy-filter/utils/test"
 	. "github.com/echocat/gocheck-addons"
-	_ "github.com/mholt/caddy/caddyhttp/basicauth"
-	_ "github.com/mholt/caddy/caddyhttp/errors"
-	_ "github.com/mholt/caddy/caddyhttp/fastcgi"
-	_ "github.com/mholt/caddy/caddyhttp/gzip"
-	_ "github.com/mholt/caddy/caddyhttp/log"
-	_ "github.com/mholt/caddy/caddyhttp/markdown"
-	_ "github.com/mholt/caddy/caddyhttp/proxy"
-	_ "github.com/mholt/caddy/caddyhttp/redirect"
-	_ "github.com/mholt/caddy/caddyhttp/root"
 	. "gopkg.in/check.v1"
 	"io"
 	"io/ioutil"
diff --git a/responseWriterWrapper.go b/responseWriterWrapper.go
@@ -10,7 +10,7 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/mholt/caddy/caddyhttp/httpserver"
+	"github.com/caddyserver/caddy/caddyhttp/httpserver"
 )
 
 func newResponseWriterWrapperFor(delegate http.ResponseWriter, beforeFirstWrite func(*responseWriterWrapper) bool) *responseWriterWrapper {
diff --git a/utils/test/testingCaddy.go b/utils/test/testingCaddy.go
@@ -3,7 +3,7 @@ package test
 import (
 	"flag"
 	"fmt"
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 	"io"
 	"log"
 	"os"

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ go 1.12`
`4`	`4`
`5`	`5`	`require (`
`6`	`6`	`github.com/NYTimes/gziphandler v1.1.1`
	`7`	`+ github.com/caddyserver/caddy v1.0.1`
`7`	`8`	`github.com/echocat/gocheck-addons v0.0.0-20170127185256-3597b4964e95`
`8`		`- github.com/mholt/caddy v1.0.0`
`9`	`9`	`gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405`
`10`	`10`	`)`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import (`
`10`	`10`	`"net/http"`
`11`	`11`	`"strings"`
`12`	`12`
`13`		`- "github.com/mholt/caddy/caddyhttp/httpserver"`
	`13`	`+ "github.com/caddyserver/caddy/caddyhttp/httpserver"`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`func newResponseWriterWrapperFor(delegate http.ResponseWriter, beforeFirstWrite func(responseWriterWrapper) bool) responseWriterWrapper {`