summaryrefslogtreecommitdiff
path: root/modules/caddyhttp
diff options
context:
space:
mode:
Diffstat (limited to 'modules/caddyhttp')
-rw-r--r--modules/caddyhttp/caddyhttp.go4
-rw-r--r--modules/caddyhttp/caddylog/log.go4
-rw-r--r--modules/caddyhttp/encode/brotli/brotli.go4
-rw-r--r--modules/caddyhttp/encode/encode.go4
-rw-r--r--modules/caddyhttp/encode/gzip/gzip.go4
-rw-r--r--modules/caddyhttp/encode/zstd/zstd.go4
-rw-r--r--modules/caddyhttp/errors.go2
-rw-r--r--modules/caddyhttp/fileserver/browse.go4
-rw-r--r--modules/caddyhttp/fileserver/browselisting.go2
-rw-r--r--modules/caddyhttp/fileserver/matcher.go4
-rw-r--r--modules/caddyhttp/fileserver/staticfiles.go4
-rw-r--r--modules/caddyhttp/headers/headers.go4
-rw-r--r--modules/caddyhttp/markdown/markdown.go4
-rw-r--r--modules/caddyhttp/matchers.go4
-rw-r--r--modules/caddyhttp/matchers_test.go2
-rw-r--r--modules/caddyhttp/replacer.go2
-rw-r--r--modules/caddyhttp/requestbody/requestbody.go4
-rwxr-xr-xmodules/caddyhttp/reverseproxy/module.go2
-rwxr-xr-xmodules/caddyhttp/reverseproxy/upstream.go2
-rw-r--r--modules/caddyhttp/rewrite/rewrite.go4
-rw-r--r--modules/caddyhttp/routes.go2
-rw-r--r--modules/caddyhttp/server.go4
-rw-r--r--modules/caddyhttp/staticresp.go2
-rw-r--r--modules/caddyhttp/staticresp_test.go2
-rw-r--r--modules/caddyhttp/table.go2
-rw-r--r--modules/caddyhttp/templates/templates.go4
-rw-r--r--modules/caddyhttp/templates/tplcontext.go2
27 files changed, 43 insertions, 43 deletions
diff --git a/modules/caddyhttp/caddyhttp.go b/modules/caddyhttp/caddyhttp.go
index aa31227..7d30178 100644
--- a/modules/caddyhttp/caddyhttp.go
+++ b/modules/caddyhttp/caddyhttp.go
@@ -26,8 +26,8 @@ import (
"strings"
"time"
- "github.com/caddyserver/caddy"
- "github.com/caddyserver/caddy/modules/caddytls"
+ "github.com/caddyserver/caddy/v2"
+ "github.com/caddyserver/caddy/v2/modules/caddytls"
"github.com/mholt/certmagic"
)
diff --git a/modules/caddyhttp/caddylog/log.go b/modules/caddyhttp/caddylog/log.go
index fef826b..1ac249c 100644
--- a/modules/caddyhttp/caddylog/log.go
+++ b/modules/caddyhttp/caddylog/log.go
@@ -19,8 +19,8 @@ import (
"net/http"
"time"
- "github.com/caddyserver/caddy"
- "github.com/caddyserver/caddy/modules/caddyhttp"
+ "github.com/caddyserver/caddy/v2"
+ "github.com/caddyserver/caddy/v2/modules/caddyhttp"
)
func init() {
diff --git a/modules/caddyhttp/encode/brotli/brotli.go b/modules/caddyhttp/encode/brotli/brotli.go
index 38af6c6..0890d43 100644
--- a/modules/caddyhttp/encode/brotli/brotli.go
+++ b/modules/caddyhttp/encode/brotli/brotli.go
@@ -18,8 +18,8 @@ import (
"fmt"
"github.com/andybalholm/brotli"
- "github.com/caddyserver/caddy"
- "github.com/caddyserver/caddy/modules/caddyhttp/encode"
+ "github.com/caddyserver/caddy/v2"
+ "github.com/caddyserver/caddy/v2/modules/caddyhttp/encode"
)
func init() {
diff --git a/modules/caddyhttp/encode/encode.go b/modules/caddyhttp/encode/encode.go
index 3eebe68..2b45917 100644
--- a/modules/caddyhttp/encode/encode.go
+++ b/modules/caddyhttp/encode/encode.go
@@ -30,8 +30,8 @@ import (
"strings"
"sync"
- "github.com/caddyserver/caddy"
- "github.com/caddyserver/caddy/modules/caddyhttp"
+ "github.com/caddyserver/caddy/v2"
+ "github.com/caddyserver/caddy/v2/modules/caddyhttp"
)
func init() {
diff --git a/modules/caddyhttp/encode/gzip/gzip.go b/modules/caddyhttp/encode/gzip/gzip.go
index 9dea9b0..45c5f54 100644
--- a/modules/caddyhttp/encode/gzip/gzip.go
+++ b/modules/caddyhttp/encode/gzip/gzip.go
@@ -19,8 +19,8 @@ import (
"compress/gzip" // TODO: consider using https://github.com/klauspost/compress/gzip
"fmt"
- "github.com/caddyserver/caddy"
- "github.com/caddyserver/caddy/modules/caddyhttp/encode"
+ "github.com/caddyserver/caddy/v2"
+ "github.com/caddyserver/caddy/v2/modules/caddyhttp/encode"
)
func init() {
diff --git a/modules/caddyhttp/encode/zstd/zstd.go b/modules/caddyhttp/encode/zstd/zstd.go
index 40bcedc..1470baf 100644
--- a/modules/caddyhttp/encode/zstd/zstd.go
+++ b/modules/caddyhttp/encode/zstd/zstd.go
@@ -15,8 +15,8 @@
package caddyzstd
import (
- "github.com/caddyserver/caddy"
- "github.com/caddyserver/caddy/modules/caddyhttp/encode"
+ "github.com/caddyserver/caddy/v2"
+ "github.com/caddyserver/caddy/v2/modules/caddyhttp/encode"
"github.com/klauspost/compress/zstd"
)
diff --git a/modules/caddyhttp/errors.go b/modules/caddyhttp/errors.go
index 7a1ea43..db64399 100644
--- a/modules/caddyhttp/errors.go
+++ b/modules/caddyhttp/errors.go
@@ -21,7 +21,7 @@ import (
"runtime"
"strings"
- "github.com/caddyserver/caddy"
+ "github.com/caddyserver/caddy/v2"
)
// 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 9dd09e9..e0e6de2 100644
--- a/modules/caddyhttp/fileserver/browse.go
+++ b/modules/caddyhttp/fileserver/browse.go
@@ -23,8 +23,8 @@ import (
"path"
"strings"
- "github.com/caddyserver/caddy"
- "github.com/caddyserver/caddy/modules/caddyhttp"
+ "github.com/caddyserver/caddy/v2"
+ "github.com/caddyserver/caddy/v2/modules/caddyhttp"
)
// Browse configures directory browsing.
diff --git a/modules/caddyhttp/fileserver/browselisting.go b/modules/caddyhttp/fileserver/browselisting.go
index d81e86c..b2349f8 100644
--- a/modules/caddyhttp/fileserver/browselisting.go
+++ b/modules/caddyhttp/fileserver/browselisting.go
@@ -23,7 +23,7 @@ import (
"strings"
"time"
- "github.com/caddyserver/caddy"
+ "github.com/caddyserver/caddy/v2"
"github.com/dustin/go-humanize"
)
diff --git a/modules/caddyhttp/fileserver/matcher.go b/modules/caddyhttp/fileserver/matcher.go
index 2ff873f..da36eaa 100644
--- a/modules/caddyhttp/fileserver/matcher.go
+++ b/modules/caddyhttp/fileserver/matcher.go
@@ -18,8 +18,8 @@ import (
"net/http"
"os"
- "github.com/caddyserver/caddy"
- "github.com/caddyserver/caddy/modules/caddyhttp"
+ "github.com/caddyserver/caddy/v2"
+ "github.com/caddyserver/caddy/v2/modules/caddyhttp"
)
func init() {
diff --git a/modules/caddyhttp/fileserver/staticfiles.go b/modules/caddyhttp/fileserver/staticfiles.go
index ff48961..67a337b 100644
--- a/modules/caddyhttp/fileserver/staticfiles.go
+++ b/modules/caddyhttp/fileserver/staticfiles.go
@@ -27,8 +27,8 @@ import (
"strings"
"time"
- "github.com/caddyserver/caddy"
- "github.com/caddyserver/caddy/modules/caddyhttp"
+ "github.com/caddyserver/caddy/v2"
+ "github.com/caddyserver/caddy/v2/modules/caddyhttp"
)
func init() {
diff --git a/modules/caddyhttp/headers/headers.go b/modules/caddyhttp/headers/headers.go
index b9a10d4..f1b45da 100644
--- a/modules/caddyhttp/headers/headers.go
+++ b/modules/caddyhttp/headers/headers.go
@@ -18,8 +18,8 @@ import (
"net/http"
"strings"
- "github.com/caddyserver/caddy"
- "github.com/caddyserver/caddy/modules/caddyhttp"
+ "github.com/caddyserver/caddy/v2"
+ "github.com/caddyserver/caddy/v2/modules/caddyhttp"
)
func init() {
diff --git a/modules/caddyhttp/markdown/markdown.go b/modules/caddyhttp/markdown/markdown.go
index ec5fc26..146a60d 100644
--- a/modules/caddyhttp/markdown/markdown.go
+++ b/modules/caddyhttp/markdown/markdown.go
@@ -23,8 +23,8 @@ import (
"gopkg.in/russross/blackfriday.v2"
- "github.com/caddyserver/caddy"
- "github.com/caddyserver/caddy/modules/caddyhttp"
+ "github.com/caddyserver/caddy/v2"
+ "github.com/caddyserver/caddy/v2/modules/caddyhttp"
)
func init() {
diff --git a/modules/caddyhttp/matchers.go b/modules/caddyhttp/matchers.go
index fe5a6cb..6c5a23e 100644
--- a/modules/caddyhttp/matchers.go
+++ b/modules/caddyhttp/matchers.go
@@ -27,8 +27,8 @@ import (
"regexp"
"strings"
- "github.com/caddyserver/caddy"
- "github.com/caddyserver/caddy/pkg/caddyscript"
+ "github.com/caddyserver/caddy/v2"
+ "github.com/caddyserver/caddy/v2/pkg/caddyscript"
"go.starlark.net/starlark"
)
diff --git a/modules/caddyhttp/matchers_test.go b/modules/caddyhttp/matchers_test.go
index cc934b1..48783ae 100644
--- a/modules/caddyhttp/matchers_test.go
+++ b/modules/caddyhttp/matchers_test.go
@@ -22,7 +22,7 @@ import (
"net/url"
"testing"
- "github.com/caddyserver/caddy"
+ "github.com/caddyserver/caddy/v2"
)
func TestHostMatcher(t *testing.T) {
diff --git a/modules/caddyhttp/replacer.go b/modules/caddyhttp/replacer.go
index 5558eb9..11f3bdb 100644
--- a/modules/caddyhttp/replacer.go
+++ b/modules/caddyhttp/replacer.go
@@ -21,7 +21,7 @@ import (
"path"
"strings"
- "github.com/caddyserver/caddy"
+ "github.com/caddyserver/caddy/v2"
)
// 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 251ef1e..14743f4 100644
--- a/modules/caddyhttp/requestbody/requestbody.go
+++ b/modules/caddyhttp/requestbody/requestbody.go
@@ -17,8 +17,8 @@ package requestbody
import (
"net/http"
- "github.com/caddyserver/caddy"
- "github.com/caddyserver/caddy/modules/caddyhttp"
+ "github.com/caddyserver/caddy/v2"
+ "github.com/caddyserver/caddy/v2/modules/caddyhttp"
)
func init() {
diff --git a/modules/caddyhttp/reverseproxy/module.go b/modules/caddyhttp/reverseproxy/module.go
index b246712..72946b7 100755
--- a/modules/caddyhttp/reverseproxy/module.go
+++ b/modules/caddyhttp/reverseproxy/module.go
@@ -15,7 +15,7 @@
package reverseproxy
import (
- "github.com/caddyserver/caddy"
+ "github.com/caddyserver/caddy/v2"
)
// Register caddy module.
diff --git a/modules/caddyhttp/reverseproxy/upstream.go b/modules/caddyhttp/reverseproxy/upstream.go
index bcbcd22..a7fea3e 100755
--- a/modules/caddyhttp/reverseproxy/upstream.go
+++ b/modules/caddyhttp/reverseproxy/upstream.go
@@ -28,7 +28,7 @@ import (
"sync/atomic"
"time"
- "github.com/caddyserver/caddy"
+ "github.com/caddyserver/caddy/v2"
)
// CircuitBreaker defines the functionality of a circuit breaker module.
diff --git a/modules/caddyhttp/rewrite/rewrite.go b/modules/caddyhttp/rewrite/rewrite.go
index e56a758..9060e22 100644
--- a/modules/caddyhttp/rewrite/rewrite.go
+++ b/modules/caddyhttp/rewrite/rewrite.go
@@ -19,8 +19,8 @@ import (
"net/url"
"strings"
- "github.com/caddyserver/caddy"
- "github.com/caddyserver/caddy/modules/caddyhttp"
+ "github.com/caddyserver/caddy/v2"
+ "github.com/caddyserver/caddy/v2/modules/caddyhttp"
)
func init() {
diff --git a/modules/caddyhttp/routes.go b/modules/caddyhttp/routes.go
index 18a2f15..0882be6 100644
--- a/modules/caddyhttp/routes.go
+++ b/modules/caddyhttp/routes.go
@@ -19,7 +19,7 @@ import (
"fmt"
"net/http"
- "github.com/caddyserver/caddy"
+ "github.com/caddyserver/caddy/v2"
)
// ServerRoute represents a set of matching rules,
diff --git a/modules/caddyhttp/server.go b/modules/caddyhttp/server.go
index 3746318..1460152 100644
--- a/modules/caddyhttp/server.go
+++ b/modules/caddyhttp/server.go
@@ -23,8 +23,8 @@ import (
"strconv"
"strings"
- "github.com/caddyserver/caddy"
- "github.com/caddyserver/caddy/modules/caddytls"
+ "github.com/caddyserver/caddy/v2"
+ "github.com/caddyserver/caddy/v2/modules/caddytls"
)
// Server is an HTTP server.
diff --git a/modules/caddyhttp/staticresp.go b/modules/caddyhttp/staticresp.go
index 7fbb14d..3f43c92 100644
--- a/modules/caddyhttp/staticresp.go
+++ b/modules/caddyhttp/staticresp.go
@@ -19,7 +19,7 @@ import (
"net/http"
"strconv"
- "github.com/caddyserver/caddy"
+ "github.com/caddyserver/caddy/v2"
)
func init() {
diff --git a/modules/caddyhttp/staticresp_test.go b/modules/caddyhttp/staticresp_test.go
index d75bf6c..b518bb0 100644
--- a/modules/caddyhttp/staticresp_test.go
+++ b/modules/caddyhttp/staticresp_test.go
@@ -21,7 +21,7 @@ import (
"net/http/httptest"
"testing"
- "github.com/caddyserver/caddy"
+ "github.com/caddyserver/caddy/v2"
)
func TestStaticResponseHandler(t *testing.T) {
diff --git a/modules/caddyhttp/table.go b/modules/caddyhttp/table.go
index 167a33b..7d98682 100644
--- a/modules/caddyhttp/table.go
+++ b/modules/caddyhttp/table.go
@@ -17,7 +17,7 @@ package caddyhttp
import (
"net/http"
- "github.com/caddyserver/caddy"
+ "github.com/caddyserver/caddy/v2"
)
func init() {
diff --git a/modules/caddyhttp/templates/templates.go b/modules/caddyhttp/templates/templates.go
index c9ed1c8..e5bfa35 100644
--- a/modules/caddyhttp/templates/templates.go
+++ b/modules/caddyhttp/templates/templates.go
@@ -22,8 +22,8 @@ import (
"strconv"
"strings"
- "github.com/caddyserver/caddy"
- "github.com/caddyserver/caddy/modules/caddyhttp"
+ "github.com/caddyserver/caddy/v2"
+ "github.com/caddyserver/caddy/v2/modules/caddyhttp"
)
func init() {
diff --git a/modules/caddyhttp/templates/tplcontext.go b/modules/caddyhttp/templates/tplcontext.go
index 988a4e8..548b3e1 100644
--- a/modules/caddyhttp/templates/tplcontext.go
+++ b/modules/caddyhttp/templates/tplcontext.go
@@ -26,7 +26,7 @@ import (
"sync"
"github.com/Masterminds/sprig"
- "github.com/caddyserver/caddy/modules/caddyhttp"
+ "github.com/caddyserver/caddy/v2/modules/caddyhttp"
"gopkg.in/russross/blackfriday.v2"
)