Browse Source

Change import paths to GitHub package names

master
Matthew Holt 6 years ago
parent
commit
613aecb898
  1. 22
      cmd/caddy2/main.go
  2. 2
      cmd/run.go
  3. 2
      go.mod
  4. 4
      modules/caddyhttp/caddyhttp.go
  5. 4
      modules/caddyhttp/caddylog/log.go
  6. 2
      modules/caddyhttp/errors.go
  7. 4
      modules/caddyhttp/fileserver/browse.go
  8. 2
      modules/caddyhttp/fileserver/browselisting.go
  9. 4
      modules/caddyhttp/fileserver/matcher.go
  10. 4
      modules/caddyhttp/fileserver/staticfiles.go
  11. 4
      modules/caddyhttp/headers/headers.go
  12. 4
      modules/caddyhttp/markdown/markdown.go
  13. 4
      modules/caddyhttp/matchers.go
  14. 2
      modules/caddyhttp/matchers_test.go
  15. 2
      modules/caddyhttp/replacer.go
  16. 4
      modules/caddyhttp/requestbody/requestbody.go
  17. 2
      modules/caddyhttp/reverseproxy/module.go
  18. 2
      modules/caddyhttp/reverseproxy/upstream.go
  19. 4
      modules/caddyhttp/rewrite/rewrite.go
  20. 2
      modules/caddyhttp/routes.go
  21. 5
      modules/caddyhttp/server.go
  22. 2
      modules/caddyhttp/staticresp.go
  23. 2
      modules/caddyhttp/table.go
  24. 2
      modules/caddytls/acmemanager.go
  25. 2
      modules/caddytls/connpolicy.go
  26. 2
      modules/caddytls/fileloader.go
  27. 2
      modules/caddytls/folderloader.go
  28. 2
      modules/caddytls/matchers.go
  29. 2
      modules/caddytls/sessiontickets.go
  30. 4
      modules/caddytls/standardstek/stek.go
  31. 2
      modules/caddytls/tls.go
  32. 2
      pkg/caddyscript/matcherenv.go

22
cmd/caddy2/main.go

@ -1,19 +1,19 @@
package main package main
import ( import (
caddycmd "bitbucket.org/lightcodelabs/caddy2/cmd" caddycmd "github.com/caddyserver/caddy2/cmd"
// this is where modules get plugged in // this is where modules get plugged in
_ "bitbucket.org/lightcodelabs/caddy2/modules/caddyhttp" _ "github.com/caddyserver/caddy2/modules/caddyhttp"
_ "bitbucket.org/lightcodelabs/caddy2/modules/caddyhttp/caddylog" _ "github.com/caddyserver/caddy2/modules/caddyhttp/caddylog"
_ "bitbucket.org/lightcodelabs/caddy2/modules/caddyhttp/fileserver" _ "github.com/caddyserver/caddy2/modules/caddyhttp/fileserver"
_ "bitbucket.org/lightcodelabs/caddy2/modules/caddyhttp/headers" _ "github.com/caddyserver/caddy2/modules/caddyhttp/headers"
_ "bitbucket.org/lightcodelabs/caddy2/modules/caddyhttp/markdown" _ "github.com/caddyserver/caddy2/modules/caddyhttp/markdown"
_ "bitbucket.org/lightcodelabs/caddy2/modules/caddyhttp/requestbody" _ "github.com/caddyserver/caddy2/modules/caddyhttp/requestbody"
_ "bitbucket.org/lightcodelabs/caddy2/modules/caddyhttp/reverseproxy" _ "github.com/caddyserver/caddy2/modules/caddyhttp/reverseproxy"
_ "bitbucket.org/lightcodelabs/caddy2/modules/caddyhttp/rewrite" _ "github.com/caddyserver/caddy2/modules/caddyhttp/rewrite"
_ "bitbucket.org/lightcodelabs/caddy2/modules/caddytls" _ "github.com/caddyserver/caddy2/modules/caddytls"
_ "bitbucket.org/lightcodelabs/caddy2/modules/caddytls/standardstek" _ "github.com/caddyserver/caddy2/modules/caddytls/standardstek"
) )
func main() { func main() {

2
cmd/run.go

@ -4,7 +4,7 @@ import (
"flag" "flag"
"log" "log"
"bitbucket.org/lightcodelabs/caddy2" "github.com/caddyserver/caddy2"
) )
// Main executes the main function of the caddy command. // Main executes the main function of the caddy command.

2
go.mod

@ -1,4 +1,4 @@
module bitbucket.org/lightcodelabs/caddy2 module github.com/caddyserver/caddy2
go 1.12 go 1.12

4
modules/caddyhttp/caddyhttp.go

@ -12,8 +12,8 @@ import (
"strings" "strings"
"time" "time"
"bitbucket.org/lightcodelabs/caddy2" "github.com/caddyserver/caddy2"
"bitbucket.org/lightcodelabs/caddy2/modules/caddytls" "github.com/caddyserver/caddy2/modules/caddytls"
"github.com/mholt/certmagic" "github.com/mholt/certmagic"
) )

4
modules/caddyhttp/caddylog/log.go

@ -5,8 +5,8 @@ import (
"net/http" "net/http"
"time" "time"
"bitbucket.org/lightcodelabs/caddy2" "github.com/caddyserver/caddy2"
"bitbucket.org/lightcodelabs/caddy2/modules/caddyhttp" "github.com/caddyserver/caddy2/modules/caddyhttp"
) )
func init() { func init() {

2
modules/caddyhttp/errors.go

@ -7,7 +7,7 @@ import (
"runtime" "runtime"
"strings" "strings"
"bitbucket.org/lightcodelabs/caddy2" "github.com/caddyserver/caddy2"
) )
// Error is a convenient way for a Handler to populate the // Error is a convenient way for a Handler to populate the

4
modules/caddyhttp/fileserver/browse.go

@ -9,8 +9,8 @@ import (
"path" "path"
"strings" "strings"
"bitbucket.org/lightcodelabs/caddy2" "github.com/caddyserver/caddy2"
"bitbucket.org/lightcodelabs/caddy2/modules/caddyhttp" "github.com/caddyserver/caddy2/modules/caddyhttp"
) )
// Browse configures directory browsing. // Browse configures directory browsing.

2
modules/caddyhttp/fileserver/browselisting.go

@ -9,7 +9,7 @@ import (
"strings" "strings"
"time" "time"
"bitbucket.org/lightcodelabs/caddy2" "github.com/caddyserver/caddy2"
"github.com/dustin/go-humanize" "github.com/dustin/go-humanize"
) )

4
modules/caddyhttp/fileserver/matcher.go

@ -4,8 +4,8 @@ import (
"net/http" "net/http"
"os" "os"
"bitbucket.org/lightcodelabs/caddy2" "github.com/caddyserver/caddy2"
"bitbucket.org/lightcodelabs/caddy2/modules/caddyhttp" "github.com/caddyserver/caddy2/modules/caddyhttp"
) )
func init() { func init() {

4
modules/caddyhttp/fileserver/staticfiles.go

@ -12,8 +12,8 @@ import (
"strings" "strings"
"time" "time"
"bitbucket.org/lightcodelabs/caddy2" "github.com/caddyserver/caddy2"
"bitbucket.org/lightcodelabs/caddy2/modules/caddyhttp" "github.com/caddyserver/caddy2/modules/caddyhttp"
) )
func init() { func init() {

4
modules/caddyhttp/headers/headers.go

@ -4,8 +4,8 @@ import (
"net/http" "net/http"
"strings" "strings"
"bitbucket.org/lightcodelabs/caddy2" "github.com/caddyserver/caddy2"
"bitbucket.org/lightcodelabs/caddy2/modules/caddyhttp" "github.com/caddyserver/caddy2/modules/caddyhttp"
) )
func init() { func init() {

4
modules/caddyhttp/markdown/markdown.go

@ -6,8 +6,8 @@ import (
"gopkg.in/russross/blackfriday.v2" "gopkg.in/russross/blackfriday.v2"
"bitbucket.org/lightcodelabs/caddy2" "github.com/caddyserver/caddy2"
"bitbucket.org/lightcodelabs/caddy2/modules/caddyhttp" "github.com/caddyserver/caddy2/modules/caddyhttp"
) )
func init() { func init() {

4
modules/caddyhttp/matchers.go

@ -13,8 +13,8 @@ import (
"regexp" "regexp"
"strings" "strings"
"bitbucket.org/lightcodelabs/caddy2" "github.com/caddyserver/caddy2"
"bitbucket.org/lightcodelabs/caddy2/pkg/caddyscript" "github.com/caddyserver/caddy2/pkg/caddyscript"
"go.starlark.net/starlark" "go.starlark.net/starlark"
) )

2
modules/caddyhttp/matchers_test.go

@ -8,7 +8,7 @@ import (
"net/url" "net/url"
"testing" "testing"
"bitbucket.org/lightcodelabs/caddy2" "github.com/caddyserver/caddy2"
) )
func TestHostMatcher(t *testing.T) { func TestHostMatcher(t *testing.T) {

2
modules/caddyhttp/replacer.go

@ -7,7 +7,7 @@ import (
"path" "path"
"strings" "strings"
"bitbucket.org/lightcodelabs/caddy2" "github.com/caddyserver/caddy2"
) )
// TODO: A simple way to format or escape or encode each value would be nice // TODO: A simple way to format or escape or encode each value would be nice

4
modules/caddyhttp/requestbody/requestbody.go

@ -3,8 +3,8 @@ package requestbody
import ( import (
"net/http" "net/http"
"bitbucket.org/lightcodelabs/caddy2" "github.com/caddyserver/caddy2"
"bitbucket.org/lightcodelabs/caddy2/modules/caddyhttp" "github.com/caddyserver/caddy2/modules/caddyhttp"
) )
func init() { func init() {

2
modules/caddyhttp/reverseproxy/module.go

@ -1,7 +1,7 @@
package reverseproxy package reverseproxy
import ( import (
"bitbucket.org/lightcodelabs/caddy2" "github.com/caddyserver/caddy2"
) )
// Register caddy module. // Register caddy module.

2
modules/caddyhttp/reverseproxy/upstream.go

@ -14,7 +14,7 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
"bitbucket.org/lightcodelabs/caddy2" "github.com/caddyserver/caddy2"
) )
// CircuitBreaker defines the functionality of a circuit breaker module. // CircuitBreaker defines the functionality of a circuit breaker module.

4
modules/caddyhttp/rewrite/rewrite.go

@ -5,8 +5,8 @@ import (
"net/url" "net/url"
"strings" "strings"
"bitbucket.org/lightcodelabs/caddy2" "github.com/caddyserver/caddy2"
"bitbucket.org/lightcodelabs/caddy2/modules/caddyhttp" "github.com/caddyserver/caddy2/modules/caddyhttp"
) )
func init() { func init() {

2
modules/caddyhttp/routes.go

@ -5,7 +5,7 @@ import (
"fmt" "fmt"
"net/http" "net/http"
"bitbucket.org/lightcodelabs/caddy2" "github.com/caddyserver/caddy2"
) )
// ServerRoute represents a set of matching rules, // ServerRoute represents a set of matching rules,

5
modules/caddyhttp/server.go

@ -8,8 +8,8 @@ import (
"net/http" "net/http"
"strconv" "strconv"
"bitbucket.org/lightcodelabs/caddy2" "github.com/caddyserver/caddy2"
"bitbucket.org/lightcodelabs/caddy2/modules/caddytls" "github.com/caddyserver/caddy2/modules/caddytls"
) )
// Server is an HTTP server. // Server is an HTTP server.
@ -22,6 +22,7 @@ type Server struct {
MaxHeaderBytes int `json:"max_header_bytes,omitempty"` MaxHeaderBytes int `json:"max_header_bytes,omitempty"`
Routes RouteList `json:"routes,omitempty"` Routes RouteList `json:"routes,omitempty"`
Errors *httpErrorConfig `json:"errors,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"` TLSConnPolicies caddytls.ConnectionPolicies `json:"tls_connection_policies,omitempty"`
DisableAutoHTTPS bool `json:"disable_auto_https,omitempty"` DisableAutoHTTPS bool `json:"disable_auto_https,omitempty"`
DisableAutoHTTPSRedir bool `json:"disable_auto_https_redir,omitempty"` DisableAutoHTTPSRedir bool `json:"disable_auto_https_redir,omitempty"`

2
modules/caddyhttp/staticresp.go

@ -5,7 +5,7 @@ import (
"net/http" "net/http"
"strconv" "strconv"
"bitbucket.org/lightcodelabs/caddy2" "github.com/caddyserver/caddy2"
) )
func init() { func init() {

2
modules/caddyhttp/table.go

@ -3,7 +3,7 @@ package caddyhttp
import ( import (
"net/http" "net/http"
"bitbucket.org/lightcodelabs/caddy2" "github.com/caddyserver/caddy2"
) )
func init() { func init() {

2
modules/caddytls/acmemanager.go

@ -7,7 +7,7 @@ import (
"github.com/go-acme/lego/certcrypto" "github.com/go-acme/lego/certcrypto"
"bitbucket.org/lightcodelabs/caddy2" "github.com/caddyserver/caddy2"
"github.com/go-acme/lego/challenge" "github.com/go-acme/lego/challenge"
"github.com/mholt/certmagic" "github.com/mholt/certmagic"
) )

2
modules/caddytls/connpolicy.go

@ -7,7 +7,7 @@ import (
"fmt" "fmt"
"strings" "strings"
"bitbucket.org/lightcodelabs/caddy2" "github.com/caddyserver/caddy2"
"github.com/go-acme/lego/challenge/tlsalpn01" "github.com/go-acme/lego/challenge/tlsalpn01"
"github.com/mholt/certmagic" "github.com/mholt/certmagic"
) )

2
modules/caddytls/fileloader.go

@ -5,7 +5,7 @@ import (
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"bitbucket.org/lightcodelabs/caddy2" "github.com/caddyserver/caddy2"
) )
func init() { func init() {

2
modules/caddytls/folderloader.go

@ -10,7 +10,7 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"bitbucket.org/lightcodelabs/caddy2" "github.com/caddyserver/caddy2"
) )
func init() { func init() {

2
modules/caddytls/matchers.go

@ -3,7 +3,7 @@ package caddytls
import ( import (
"crypto/tls" "crypto/tls"
"bitbucket.org/lightcodelabs/caddy2" "github.com/caddyserver/caddy2"
) )
// MatchServerName matches based on SNI. // MatchServerName matches based on SNI.

2
modules/caddytls/sessiontickets.go

@ -9,7 +9,7 @@ import (
"sync" "sync"
"time" "time"
"bitbucket.org/lightcodelabs/caddy2" "github.com/caddyserver/caddy2"
) )
// SessionTicketService configures and manages TLS session tickets. // SessionTicketService configures and manages TLS session tickets.

4
modules/caddytls/standardstek/stek.go

@ -5,8 +5,8 @@ import (
"sync" "sync"
"time" "time"
"bitbucket.org/lightcodelabs/caddy2" "github.com/caddyserver/caddy2"
"bitbucket.org/lightcodelabs/caddy2/modules/caddytls" "github.com/caddyserver/caddy2/modules/caddytls"
) )
func init() { func init() {

2
modules/caddytls/tls.go

@ -6,7 +6,7 @@ import (
"fmt" "fmt"
"net/http" "net/http"
"bitbucket.org/lightcodelabs/caddy2" "github.com/caddyserver/caddy2"
"github.com/go-acme/lego/challenge" "github.com/go-acme/lego/challenge"
"github.com/mholt/certmagic" "github.com/mholt/certmagic"
) )

2
pkg/caddyscript/matcherenv.go

@ -3,7 +3,7 @@ package caddyscript
import ( import (
"net/http" "net/http"
caddyscript "bitbucket.org/lightcodelabs/caddy2/pkg/caddyscript/lib" caddyscript "github.com/caddyserver/caddy2/pkg/caddyscript/lib"
"go.starlark.net/starlark" "go.starlark.net/starlark"
) )

Loading…
Cancel
Save