Skip to content

Commit

Permalink
Change caddy path to github.com/caddyserver/caddy (#63)
Browse files Browse the repository at this point in the history
  • Loading branch information
sergeyfrolov authored Jul 7, 2019
1 parent 694cbc9 commit 05540a7
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion cmd/caddy/caddy.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package main

import (
"github.com/mholt/caddy/caddy/caddymain"
"github.com/caddyserver/caddy/caddy/caddymain"

_ "github.com/caddyserver/forwardproxy"
)
Expand Down
4 changes: 2 additions & 2 deletions common_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"testing"
"time"

"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)

var credentialsEmpty = ""
Expand Down Expand Up @@ -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}",
Expand Down
2 changes: 1 addition & 1 deletion forwardproxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions forwardproxy_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion setup_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package forwardproxy
import (
"testing"

"github.com/mholt/caddy"
"github.com/caddyserver/caddy"
)

func TestSetup(t *testing.T) {
Expand Down

0 comments on commit 05540a7

Please sign in to comment.