summaryrefslogtreecommitdiff
path: root/modules/caddyhttp/encode
diff options
context:
space:
mode:
authorMatthew Holt <mholt@users.noreply.github.com>2019-06-14 11:58:28 -0600
committerMatthew Holt <mholt@users.noreply.github.com>2019-06-14 11:58:28 -0600
commit5137859e47678aae81e178ca7d164f9e2b4e3121 (patch)
treef0e5cb9b9a4ad5dc03b53127fcea2a536bd6ee27 /modules/caddyhttp/encode
parentb8e7453fef3dac6036403bc384eec96becff5114 (diff)
Rename caddy2 -> caddy
Removes the version from the package name
Diffstat (limited to 'modules/caddyhttp/encode')
-rw-r--r--modules/caddyhttp/encode/brotli/brotli.go8
-rw-r--r--modules/caddyhttp/encode/encode.go10
-rw-r--r--modules/caddyhttp/encode/gzip/gzip.go12
-rw-r--r--modules/caddyhttp/encode/zstd/zstd.go6
4 files changed, 18 insertions, 18 deletions
diff --git a/modules/caddyhttp/encode/brotli/brotli.go b/modules/caddyhttp/encode/brotli/brotli.go
index 3289f0c..6bfd11f 100644
--- a/modules/caddyhttp/encode/brotli/brotli.go
+++ b/modules/caddyhttp/encode/brotli/brotli.go
@@ -4,12 +4,12 @@ import (
"fmt"
"github.com/andybalholm/brotli"
- "github.com/caddyserver/caddy2"
- "github.com/caddyserver/caddy2/modules/caddyhttp/encode"
+ "github.com/caddyserver/caddy"
+ "github.com/caddyserver/caddy/modules/caddyhttp/encode"
)
func init() {
- caddy2.RegisterModule(caddy2.Module{
+ caddy.RegisterModule(caddy.Module{
Name: "http.encoders.brotli",
New: func() interface{} { return new(Brotli) },
})
@@ -47,5 +47,5 @@ func (b Brotli) NewEncoder() encode.Encoder {
// Interface guards
var (
_ encode.Encoding = (*Brotli)(nil)
- _ caddy2.Validator = (*Brotli)(nil)
+ _ caddy.Validator = (*Brotli)(nil)
)
diff --git a/modules/caddyhttp/encode/encode.go b/modules/caddyhttp/encode/encode.go
index 2d6f524..cf658e3 100644
--- a/modules/caddyhttp/encode/encode.go
+++ b/modules/caddyhttp/encode/encode.go
@@ -16,12 +16,12 @@ import (
"strings"
"sync"
- "github.com/caddyserver/caddy2"
- "github.com/caddyserver/caddy2/modules/caddyhttp"
+ "github.com/caddyserver/caddy"
+ "github.com/caddyserver/caddy/modules/caddyhttp"
)
func init() {
- caddy2.RegisterModule(caddy2.Module{
+ caddy.RegisterModule(caddy.Module{
Name: "http.middleware.encode",
New: func() interface{} { return new(Encode) },
})
@@ -39,7 +39,7 @@ type Encode struct {
}
// Provision provisions enc.
-func (enc *Encode) Provision(ctx caddy2.Context) error {
+func (enc *Encode) Provision(ctx caddy.Context) error {
enc.Encodings = make(map[string]Encoding)
enc.writerPools = make(map[string]*sync.Pool)
@@ -280,7 +280,7 @@ const defaultMinLength = 512
// Interface guards
var (
- _ caddy2.Provisioner = (*Encode)(nil)
+ _ caddy.Provisioner = (*Encode)(nil)
_ caddyhttp.MiddlewareHandler = (*Encode)(nil)
_ caddyhttp.HTTPInterfaces = (*responseWriter)(nil)
)
diff --git a/modules/caddyhttp/encode/gzip/gzip.go b/modules/caddyhttp/encode/gzip/gzip.go
index b08385a..156eb0d 100644
--- a/modules/caddyhttp/encode/gzip/gzip.go
+++ b/modules/caddyhttp/encode/gzip/gzip.go
@@ -5,12 +5,12 @@ import (
"compress/gzip" // TODO: consider using https://github.com/klauspost/compress/gzip
"fmt"
- "github.com/caddyserver/caddy2"
- "github.com/caddyserver/caddy2/modules/caddyhttp/encode"
+ "github.com/caddyserver/caddy"
+ "github.com/caddyserver/caddy/modules/caddyhttp/encode"
)
func init() {
- caddy2.RegisterModule(caddy2.Module{
+ caddy.RegisterModule(caddy.Module{
Name: "http.encoders.gzip",
New: func() interface{} { return new(Gzip) },
})
@@ -22,7 +22,7 @@ type Gzip struct {
}
// Provision provisions g's configuration.
-func (g *Gzip) Provision(ctx caddy2.Context) error {
+func (g *Gzip) Provision(ctx caddy.Context) error {
if g.Level == 0 {
g.Level = defaultGzipLevel
}
@@ -52,6 +52,6 @@ var defaultGzipLevel = 5
// Interface guards
var (
_ encode.Encoding = (*Gzip)(nil)
- _ caddy2.Provisioner = (*Gzip)(nil)
- _ caddy2.Validator = (*Gzip)(nil)
+ _ caddy.Provisioner = (*Gzip)(nil)
+ _ caddy.Validator = (*Gzip)(nil)
)
diff --git a/modules/caddyhttp/encode/zstd/zstd.go b/modules/caddyhttp/encode/zstd/zstd.go
index eb66ad8..2bb8771 100644
--- a/modules/caddyhttp/encode/zstd/zstd.go
+++ b/modules/caddyhttp/encode/zstd/zstd.go
@@ -1,13 +1,13 @@
package caddyzstd
import (
- "github.com/caddyserver/caddy2"
- "github.com/caddyserver/caddy2/modules/caddyhttp/encode"
+ "github.com/caddyserver/caddy"
+ "github.com/caddyserver/caddy/modules/caddyhttp/encode"
"github.com/klauspost/compress/zstd"
)
func init() {
- caddy2.RegisterModule(caddy2.Module{
+ caddy.RegisterModule(caddy.Module{
Name: "http.encoders.zstd",
New: func() interface{} { return new(Zstd) },
})