Change import paths to GitHub package names

28 files changed, 49 insertions, 48 deletions

diff --git a/modules/caddyhttp/caddyhttp.go b/modules/caddyhttp/caddyhttp.go
index 8255032..3ffc989 100644
--- a/modules/caddyhttp/caddyhttp.go
+++ b/modules/caddyhttp/caddyhttp.go
@@ -12,8 +12,8 @@ import (
 	"strings"
 	"time"
 
-	"bitbucket.org/lightcodelabs/caddy2"
-	"bitbucket.org/lightcodelabs/caddy2/modules/caddytls"
+	"github.com/caddyserver/caddy2"
+	"github.com/caddyserver/caddy2/modules/caddytls"
 	"github.com/mholt/certmagic"
 )
 
diff --git a/modules/caddyhttp/caddylog/log.go b/modules/caddyhttp/caddylog/log.go
index f39fd87..bad54fe 100644
--- a/modules/caddyhttp/caddylog/log.go
+++ b/modules/caddyhttp/caddylog/log.go
@@ -5,8 +5,8 @@ import (
 	"net/http"
 	"time"
 
-	"bitbucket.org/lightcodelabs/caddy2"
-	"bitbucket.org/lightcodelabs/caddy2/modules/caddyhttp"
+	"github.com/caddyserver/caddy2"
+	"github.com/caddyserver/caddy2/modules/caddyhttp"
 )
 
 func init() {
diff --git a/modules/caddyhttp/errors.go b/modules/caddyhttp/errors.go
index 66cb2ca..0e7b8f2 100644
--- a/modules/caddyhttp/errors.go
+++ b/modules/caddyhttp/errors.go
@@ -7,7 +7,7 @@ import (
 	"runtime"
 	"strings"
 
-	"bitbucket.org/lightcodelabs/caddy2"
+	"github.com/caddyserver/caddy2"
 )
 
 // Error is a convenient way for a Handler to populate the
diff --git a/modules/caddyhttp/fileserver/browse.go b/modules/caddyhttp/fileserver/browse.go
index bf063e5..d86bc64 100644
--- a/modules/caddyhttp/fileserver/browse.go
+++ b/modules/caddyhttp/fileserver/browse.go
@@ -9,8 +9,8 @@ import (
 	"path"
 	"strings"
 
-	"bitbucket.org/lightcodelabs/caddy2"
-	"bitbucket.org/lightcodelabs/caddy2/modules/caddyhttp"
+	"github.com/caddyserver/caddy2"
+	"github.com/caddyserver/caddy2/modules/caddyhttp"
 )
 
 // Browse configures directory browsing.
diff --git a/modules/caddyhttp/fileserver/browselisting.go b/modules/caddyhttp/fileserver/browselisting.go
index 94705b3..ba915bf 100644
--- a/modules/caddyhttp/fileserver/browselisting.go
+++ b/modules/caddyhttp/fileserver/browselisting.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"bitbucket.org/lightcodelabs/caddy2"
+	"github.com/caddyserver/caddy2"
 	"github.com/dustin/go-humanize"
 )
 
diff --git a/modules/caddyhttp/fileserver/matcher.go b/modules/caddyhttp/fileserver/matcher.go
index 8196131..0bdbf67 100644
--- a/modules/caddyhttp/fileserver/matcher.go
+++ b/modules/caddyhttp/fileserver/matcher.go
@@ -4,8 +4,8 @@ import (
 	"net/http"
 	"os"
 
-	"bitbucket.org/lightcodelabs/caddy2"
-	"bitbucket.org/lightcodelabs/caddy2/modules/caddyhttp"
+	"github.com/caddyserver/caddy2"
+	"github.com/caddyserver/caddy2/modules/caddyhttp"
 )
 
 func init() {
diff --git a/modules/caddyhttp/fileserver/staticfiles.go b/modules/caddyhttp/fileserver/staticfiles.go
index 08f92bf..86704fa 100644
--- a/modules/caddyhttp/fileserver/staticfiles.go
+++ b/modules/caddyhttp/fileserver/staticfiles.go
@@ -12,8 +12,8 @@ import (
 	"strings"
 	"time"
 
-	"bitbucket.org/lightcodelabs/caddy2"
-	"bitbucket.org/lightcodelabs/caddy2/modules/caddyhttp"
+	"github.com/caddyserver/caddy2"
+	"github.com/caddyserver/caddy2/modules/caddyhttp"
 )
 
 func init() {
diff --git a/modules/caddyhttp/headers/headers.go b/modules/caddyhttp/headers/headers.go
index b07a588..bce5435 100644
--- a/modules/caddyhttp/headers/headers.go
+++ b/modules/caddyhttp/headers/headers.go
@@ -4,8 +4,8 @@ import (
 	"net/http"
 	"strings"
 
-	"bitbucket.org/lightcodelabs/caddy2"
-	"bitbucket.org/lightcodelabs/caddy2/modules/caddyhttp"
+	"github.com/caddyserver/caddy2"
+	"github.com/caddyserver/caddy2/modules/caddyhttp"
 )
 
 func init() {
diff --git a/modules/caddyhttp/markdown/markdown.go b/modules/caddyhttp/markdown/markdown.go
index 9c23e44..e65d4e6 100644
--- a/modules/caddyhttp/markdown/markdown.go
+++ b/modules/caddyhttp/markdown/markdown.go
@@ -6,8 +6,8 @@ import (
 
 	"gopkg.in/russross/blackfriday.v2"
 
-	"bitbucket.org/lightcodelabs/caddy2"
-	"bitbucket.org/lightcodelabs/caddy2/modules/caddyhttp"
+	"github.com/caddyserver/caddy2"
+	"github.com/caddyserver/caddy2/modules/caddyhttp"
 )
 
 func init() {
diff --git a/modules/caddyhttp/matchers.go b/modules/caddyhttp/matchers.go
index d729acf..5abaa54 100644
--- a/modules/caddyhttp/matchers.go
+++ b/modules/caddyhttp/matchers.go
@@ -13,8 +13,8 @@ import (
 	"regexp"
 	"strings"
 
-	"bitbucket.org/lightcodelabs/caddy2"
-	"bitbucket.org/lightcodelabs/caddy2/pkg/caddyscript"
+	"github.com/caddyserver/caddy2"
+	"github.com/caddyserver/caddy2/pkg/caddyscript"
 	"go.starlark.net/starlark"
 )
 
diff --git a/modules/caddyhttp/matchers_test.go b/modules/caddyhttp/matchers_test.go
index 1297bc8..9e5ee45 100644
--- a/modules/caddyhttp/matchers_test.go
+++ b/modules/caddyhttp/matchers_test.go
@@ -8,7 +8,7 @@ import (
 	"net/url"
 	"testing"
 
-	"bitbucket.org/lightcodelabs/caddy2"
+	"github.com/caddyserver/caddy2"
 )
 
 func TestHostMatcher(t *testing.T) {
diff --git a/modules/caddyhttp/replacer.go b/modules/caddyhttp/replacer.go
index 0b0547d..c854a2f 100644
--- a/modules/caddyhttp/replacer.go
+++ b/modules/caddyhttp/replacer.go
@@ -7,7 +7,7 @@ import (
 	"path"
 	"strings"
 
-	"bitbucket.org/lightcodelabs/caddy2"
+	"github.com/caddyserver/caddy2"
 )
 
 // TODO: A simple way to format or escape or encode each value would be nice
diff --git a/modules/caddyhttp/requestbody/requestbody.go b/modules/caddyhttp/requestbody/requestbody.go
index 8aba14e..a0840de 100644
--- a/modules/caddyhttp/requestbody/requestbody.go
+++ b/modules/caddyhttp/requestbody/requestbody.go
@@ -3,8 +3,8 @@ package requestbody
 import (
 	"net/http"
 
-	"bitbucket.org/lightcodelabs/caddy2"
-	"bitbucket.org/lightcodelabs/caddy2/modules/caddyhttp"
+	"github.com/caddyserver/caddy2"
+	"github.com/caddyserver/caddy2/modules/caddyhttp"
 )
 
 func init() {
diff --git a/modules/caddyhttp/reverseproxy/module.go b/modules/caddyhttp/reverseproxy/module.go
index 7e149d0..76c487f 100755
--- a/modules/caddyhttp/reverseproxy/module.go
+++ b/modules/caddyhttp/reverseproxy/module.go
@@ -1,7 +1,7 @@
 package reverseproxy
 
 import (
-	"bitbucket.org/lightcodelabs/caddy2"
+	"github.com/caddyserver/caddy2"
 )
 
 // Register caddy module.
diff --git a/modules/caddyhttp/reverseproxy/upstream.go b/modules/caddyhttp/reverseproxy/upstream.go
index 1d77a8e..b8a0330 100755
--- a/modules/caddyhttp/reverseproxy/upstream.go
+++ b/modules/caddyhttp/reverseproxy/upstream.go
@@ -14,7 +14,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"bitbucket.org/lightcodelabs/caddy2"
+	"github.com/caddyserver/caddy2"
 )
 
 // CircuitBreaker defines the functionality of a circuit breaker module.
diff --git a/modules/caddyhttp/rewrite/rewrite.go b/modules/caddyhttp/rewrite/rewrite.go
index fc91d28..bbe7659 100644
--- a/modules/caddyhttp/rewrite/rewrite.go
+++ b/modules/caddyhttp/rewrite/rewrite.go
@@ -5,8 +5,8 @@ import (
 	"net/url"
 	"strings"
 
-	"bitbucket.org/lightcodelabs/caddy2"
-	"bitbucket.org/lightcodelabs/caddy2/modules/caddyhttp"
+	"github.com/caddyserver/caddy2"
+	"github.com/caddyserver/caddy2/modules/caddyhttp"
 )
 
 func init() {
diff --git a/modules/caddyhttp/routes.go b/modules/caddyhttp/routes.go
index 14c9f32..3d78c21 100644
--- a/modules/caddyhttp/routes.go
+++ b/modules/caddyhttp/routes.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"bitbucket.org/lightcodelabs/caddy2"
+	"github.com/caddyserver/caddy2"
 )
 
 // ServerRoute represents a set of matching rules,
diff --git a/modules/caddyhttp/server.go b/modules/caddyhttp/server.go
index a7fe02d..a2199ca 100644
--- a/modules/caddyhttp/server.go
+++ b/modules/caddyhttp/server.go
@@ -8,20 +8,21 @@ import (
 	"net/http"
 	"strconv"
 
-	"bitbucket.org/lightcodelabs/caddy2"
-	"bitbucket.org/lightcodelabs/caddy2/modules/caddytls"
+	"github.com/caddyserver/caddy2"
+	"github.com/caddyserver/caddy2/modules/caddytls"
 )
 
 // Server is an HTTP server.
 type Server struct {
-	Listen                []string                    `json:"listen,omitempty"`
-	ReadTimeout           caddy2.Duration             `json:"read_timeout,omitempty"`
-	ReadHeaderTimeout     caddy2.Duration             `json:"read_header_timeout,omitempty"`
-	WriteTimeout          caddy2.Duration             `json:"write_timeout,omitempty"`
-	IdleTimeout           caddy2.Duration             `json:"idle_timeout,omitempty"`
-	MaxHeaderBytes        int                         `json:"max_header_bytes,omitempty"`
-	Routes                RouteList                   `json:"routes,omitempty"`
-	Errors                *httpErrorConfig            `json:"errors,omitempty"`
+	Listen            []string         `json:"listen,omitempty"`
+	ReadTimeout       caddy2.Duration  `json:"read_timeout,omitempty"`
+	ReadHeaderTimeout caddy2.Duration  `json:"read_header_timeout,omitempty"`
+	WriteTimeout      caddy2.Duration  `json:"write_timeout,omitempty"`
+	IdleTimeout       caddy2.Duration  `json:"idle_timeout,omitempty"`
+	MaxHeaderBytes    int              `json:"max_header_bytes,omitempty"`
+	Routes            RouteList        `json:"routes,omitempty"`
+	Errors            *httpErrorConfig `json:"errors,omitempty"`
+	// TODO: Having a separate connection policy to act as a default or template would be handy... then override using first matching conn policy...
 	TLSConnPolicies       caddytls.ConnectionPolicies `json:"tls_connection_policies,omitempty"`
 	DisableAutoHTTPS      bool                        `json:"disable_auto_https,omitempty"`
 	DisableAutoHTTPSRedir bool                        `json:"disable_auto_https_redir,omitempty"`
diff --git a/modules/caddyhttp/staticresp.go b/modules/caddyhttp/staticresp.go
index 62ab7dd..091cf3a 100644
--- a/modules/caddyhttp/staticresp.go
+++ b/modules/caddyhttp/staticresp.go
@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"strconv"
 
-	"bitbucket.org/lightcodelabs/caddy2"
+	"github.com/caddyserver/caddy2"
 )
 
 func init() {
diff --git a/modules/caddyhttp/table.go b/modules/caddyhttp/table.go
index fce4267..62077a8 100644
--- a/modules/caddyhttp/table.go
+++ b/modules/caddyhttp/table.go
@@ -3,7 +3,7 @@ package caddyhttp
 import (
 	"net/http"
 
-	"bitbucket.org/lightcodelabs/caddy2"
+	"github.com/caddyserver/caddy2"
 )
 
 func init() {
diff --git a/modules/caddytls/acmemanager.go b/modules/caddytls/acmemanager.go
index efd8e23..9352d75 100644
--- a/modules/caddytls/acmemanager.go
+++ b/modules/caddytls/acmemanager.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-acme/lego/certcrypto"
 
-	"bitbucket.org/lightcodelabs/caddy2"
+	"github.com/caddyserver/caddy2"
 	"github.com/go-acme/lego/challenge"
 	"github.com/mholt/certmagic"
 )
diff --git a/modules/caddytls/connpolicy.go b/modules/caddytls/connpolicy.go
index 006afe9..c1ca41d 100644
--- a/modules/caddytls/connpolicy.go
+++ b/modules/caddytls/connpolicy.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"strings"
 
-	"bitbucket.org/lightcodelabs/caddy2"
+	"github.com/caddyserver/caddy2"
 	"github.com/go-acme/lego/challenge/tlsalpn01"
 	"github.com/mholt/certmagic"
 )
diff --git a/modules/caddytls/fileloader.go b/modules/caddytls/fileloader.go
index 516c632..c633f17 100644
--- a/modules/caddytls/fileloader.go
+++ b/modules/caddytls/fileloader.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"io/ioutil"
 
-	"bitbucket.org/lightcodelabs/caddy2"
+	"github.com/caddyserver/caddy2"
 )
 
 func init() {
diff --git a/modules/caddytls/folderloader.go b/modules/caddytls/folderloader.go
index 8ec9827..0ce53b7 100644
--- a/modules/caddytls/folderloader.go
+++ b/modules/caddytls/folderloader.go
@@ -10,7 +10,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"bitbucket.org/lightcodelabs/caddy2"
+	"github.com/caddyserver/caddy2"
 )
 
 func init() {
diff --git a/modules/caddytls/matchers.go b/modules/caddytls/matchers.go
index a951f91..712472f 100644
--- a/modules/caddytls/matchers.go
+++ b/modules/caddytls/matchers.go
@@ -3,7 +3,7 @@ package caddytls
 import (
 	"crypto/tls"
 
-	"bitbucket.org/lightcodelabs/caddy2"
+	"github.com/caddyserver/caddy2"
 )
 
 // MatchServerName matches based on SNI.
diff --git a/modules/caddytls/sessiontickets.go b/modules/caddytls/sessiontickets.go
index 22c9a2f..1d7d9b1 100644
--- a/modules/caddytls/sessiontickets.go
+++ b/modules/caddytls/sessiontickets.go
@@ -9,7 +9,7 @@ import (
 	"sync"
 	"time"
 
-	"bitbucket.org/lightcodelabs/caddy2"
+	"github.com/caddyserver/caddy2"
 )
 
 // SessionTicketService configures and manages TLS session tickets.
diff --git a/modules/caddytls/standardstek/stek.go b/modules/caddytls/standardstek/stek.go
index a086872..939d021 100644
--- a/modules/caddytls/standardstek/stek.go
+++ b/modules/caddytls/standardstek/stek.go
@@ -5,8 +5,8 @@ import (
 	"sync"
 	"time"
 
-	"bitbucket.org/lightcodelabs/caddy2"
-	"bitbucket.org/lightcodelabs/caddy2/modules/caddytls"
+	"github.com/caddyserver/caddy2"
+	"github.com/caddyserver/caddy2/modules/caddytls"
 )
 
 func init() {
diff --git a/modules/caddytls/tls.go b/modules/caddytls/tls.go
index 6a9c97e..38447ba 100644
--- a/modules/caddytls/tls.go
+++ b/modules/caddytls/tls.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"bitbucket.org/lightcodelabs/caddy2"
+	"github.com/caddyserver/caddy2"
 	"github.com/go-acme/lego/challenge"
 	"github.com/mholt/certmagic"
 )