Change caddy path to github.com/caddyserver/caddy (#63)

This commit is contained in:
sergeyfrolov 2019-07-06 20:35:37 -06:00 committed by GitHub
parent 694cbc9ec0
commit 05540a763b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 11 deletions

View file

@ -1,7 +1,7 @@
package main
import (
"github.com/mholt/caddy/caddy/caddymain"
"github.com/caddyserver/caddy/caddy/caddymain"
_ "github.com/caddyserver/forwardproxy"
)

View file

@ -13,7 +13,7 @@ import (
"testing"
"time"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
var credentialsEmpty = ""
@ -95,7 +95,7 @@ func (c *caddyTestServer) marshal() []byte {
mainBlock = append(mainBlock, "}")
if len(c.HTTPRedirectPort) > 0 {
// TODO: this is not good enough, since `func redirPlaintextHost(cfg *SiteConfig) *SiteConfig`
// https://github.com/mholt/caddy/blob/master/caddyhttp/httpserver/https.go#L142 can change in future
// https://github.com/caddyserver/caddy/blob/master/caddyhttp/httpserver/https.go#L142 can change in future
// and we won't know.
redirectBlock := []string{"http://*:" + c.HTTPRedirectPort + " {",
"redir https://" + c.addr + "{uri}",

View file

@ -34,8 +34,8 @@ import (
"sync"
"time"
"github.com/caddyserver/caddy/caddyhttp/httpserver"
"github.com/caddyserver/forwardproxy/httpclient"
"github.com/mholt/caddy/caddyhttp/httpserver"
)
type ForwardProxy struct {

View file

@ -28,11 +28,11 @@ import (
"testing"
"time"
_ "github.com/caddyserver/caddy/caddyhttp/header"
_ "github.com/caddyserver/caddy/caddyhttp/httpserver"
_ "github.com/caddyserver/caddy/caddyhttp/redirect"
_ "github.com/caddyserver/caddy/caddyhttp/root"
"github.com/caddyserver/forwardproxy/httpclient"
_ "github.com/mholt/caddy/caddyhttp/header"
_ "github.com/mholt/caddy/caddyhttp/httpserver"
_ "github.com/mholt/caddy/caddyhttp/redirect"
_ "github.com/mholt/caddy/caddyhttp/root"
"golang.org/x/net/http2"
)

View file

@ -31,9 +31,9 @@ import (
"sync"
"time"
"github.com/caddyserver/caddy"
"github.com/caddyserver/caddy/caddyhttp/httpserver"
"github.com/caddyserver/forwardproxy/httpclient"
"github.com/mholt/caddy"
"github.com/mholt/caddy/caddyhttp/httpserver"
"golang.org/x/net/proxy"
)

View file

@ -17,7 +17,7 @@ package forwardproxy
import (
"testing"
"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)
func TestSetup(t *testing.T) {