From 05540a763b638a560c2b02c6e5b10e6f5366cb7d Mon Sep 17 00:00:00 2001
From: sergeyfrolov <sergey.frolov@colorado.edu>
Date: Sat, 6 Jul 2019 20:35:37 -0600
Subject: [PATCH] Change caddy path to github.com/caddyserver/caddy (#63)

---
 cmd/caddy/caddy.go   | 2 +-
 common_test.go       | 4 ++--
 forwardproxy.go      | 2 +-
 forwardproxy_test.go | 8 ++++----
 setup.go             | 4 ++--
 setup_test.go        | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/cmd/caddy/caddy.go b/cmd/caddy/caddy.go
index 78de8f0..87c3197 100644
--- a/cmd/caddy/caddy.go
+++ b/cmd/caddy/caddy.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/mholt/caddy/caddy/caddymain"
+	"github.com/caddyserver/caddy/caddy/caddymain"
 
 	_ "github.com/caddyserver/forwardproxy"
 )
diff --git a/common_test.go b/common_test.go
index 32083f0..631b064 100644
--- a/common_test.go
+++ b/common_test.go
@@ -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}",
diff --git a/forwardproxy.go b/forwardproxy.go
index 4eda0b8..fecaa7d 100644
--- a/forwardproxy.go
+++ b/forwardproxy.go
@@ -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 {
diff --git a/forwardproxy_test.go b/forwardproxy_test.go
index 4a73342..3ba90ee 100644
--- a/forwardproxy_test.go
+++ b/forwardproxy_test.go
@@ -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"
 )
 
diff --git a/setup.go b/setup.go
index 95a400d..1c0bd43 100644
--- a/setup.go
+++ b/setup.go
@@ -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"
 )
 
diff --git a/setup_test.go b/setup_test.go
index cece93c..2497f0a 100644
--- a/setup_test.go
+++ b/setup_test.go
@@ -17,7 +17,7 @@ package forwardproxy
 import (
 	"testing"
 
-	"github.com/mholt/caddy"
+	"github.com/caddyserver/caddy"
 )
 
 func TestSetup(t *testing.T) {