github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-11-22 10:50:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change import paths to GitHub package names

Browse Source
This commit is contained in:
Matthew Holt 2019-06-04 13:52:37 -06:00
parent 39db06d9c4
commit 613aecb898
32 changed files with 63 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cmd/caddy2/main.go
View File

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

2
cmd/run.go
View File

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

2
go.mod
View File

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

4
modules/caddyhttp/caddyhttp.go
View File

@ -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"
)

4
modules/caddyhttp/caddylog/log.go
View File

@ -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() {

2
modules/caddyhttp/errors.go
View File

@ -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

4
modules/caddyhttp/fileserver/browse.go
View File

@ -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.

2
modules/caddyhttp/fileserver/browselisting.go
View File

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

4
modules/caddyhttp/fileserver/matcher.go
View File

@ -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() {

4
modules/caddyhttp/fileserver/staticfiles.go
View File

@ -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() {

4
modules/caddyhttp/headers/headers.go
View File

@ -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() {

4
modules/caddyhttp/markdown/markdown.go
View File

@ -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() {

4
modules/caddyhttp/matchers.go
View File

@ -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"
)

2
modules/caddyhttp/matchers_test.go
View File

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

2
modules/caddyhttp/replacer.go
View File

@ -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

4
modules/caddyhttp/requestbody/requestbody.go
View File

@ -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() {

2
modules/caddyhttp/reverseproxy/module.go
View File

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

2
modules/caddyhttp/reverseproxy/upstream.go
View File

@ -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.

4
modules/caddyhttp/rewrite/rewrite.go
View File

@ -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() {

2
modules/caddyhttp/routes.go
View File

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

21
modules/caddyhttp/server.go
View File

@ -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"`

2
modules/caddyhttp/staticresp.go
View File

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

2
modules/caddyhttp/table.go
View File

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

2
modules/caddytls/acmemanager.go
View File

@ -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"
)

2
modules/caddytls/connpolicy.go
View File

@ -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"
)

2
modules/caddytls/fileloader.go
View File

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

2
modules/caddytls/folderloader.go
View File

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

2
modules/caddytls/matchers.go
View File

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

2
modules/caddytls/sessiontickets.go
View File

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

4
modules/caddytls/standardstek/stek.go
View File

@ -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() {

2
modules/caddytls/tls.go
View File

@ -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"
)

2
pkg/caddyscript/matcherenv.go
View File

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