summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorMatthew Holt <mholt@users.noreply.github.com>2019-08-09 12:19:56 -0600
committerMatthew Holt <mholt@users.noreply.github.com>2019-08-09 12:19:56 -0600
commitc4159ef76d279d6a84257b24dbe97430af32eb1e (patch)
tree8749cd1171cde33b132a94bfcd1fd8c55cdfd979 /modules
parentab885f07b844fd60adb9d49ed7884f3cd2d939a7 (diff)
Fix module-related errors
Diffstat (limited to 'modules')
-rw-r--r--modules/caddyhttp/encode/brotli/brotli.go2
-rw-r--r--modules/caddyhttp/encode/caddyfile.go8
-rw-r--r--modules/caddyhttp/encode/gzip/gzip.go2
-rw-r--r--modules/caddyhttp/encode/zstd/zstd.go2
-rw-r--r--modules/caddyhttp/fileserver/caddyfile.go4
-rw-r--r--modules/caddyhttp/fileserver/matcher.go2
-rw-r--r--modules/caddyhttp/headers/caddyfile.go4
-rwxr-xr-xmodules/caddyhttp/reverseproxy/module.go4
-rw-r--r--modules/caddyhttp/rewrite/caddyfile.go4
-rw-r--r--modules/caddyhttp/templates/caddyfile.go4
10 files changed, 18 insertions, 18 deletions
diff --git a/modules/caddyhttp/encode/brotli/brotli.go b/modules/caddyhttp/encode/brotli/brotli.go
index e30d7bc..0a9f871 100644
--- a/modules/caddyhttp/encode/brotli/brotli.go
+++ b/modules/caddyhttp/encode/brotli/brotli.go
@@ -19,7 +19,7 @@ import (
"strconv"
"github.com/andybalholm/brotli"
- "github.com/caddyserver/caddy/caddyconfig/caddyfile"
+ "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/modules/caddyhttp/encode"
)
diff --git a/modules/caddyhttp/encode/caddyfile.go b/modules/caddyhttp/encode/caddyfile.go
index 846ec03..5aca6ac 100644
--- a/modules/caddyhttp/encode/caddyfile.go
+++ b/modules/caddyhttp/encode/caddyfile.go
@@ -18,10 +18,10 @@ import (
"encoding/json"
"fmt"
- "github.com/caddyserver/caddy"
- "github.com/caddyserver/caddy/caddyconfig"
- "github.com/caddyserver/caddy/caddyconfig/caddyfile"
- "github.com/caddyserver/caddy/caddyconfig/httpcaddyfile"
+ "github.com/caddyserver/caddy/v2"
+ "github.com/caddyserver/caddy/v2/caddyconfig"
+ "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
+ "github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile"
)
// UnmarshalCaddyfile sets up the handler from Caddyfile tokens. Syntax:
diff --git a/modules/caddyhttp/encode/gzip/gzip.go b/modules/caddyhttp/encode/gzip/gzip.go
index 28b08c2..87e8816 100644
--- a/modules/caddyhttp/encode/gzip/gzip.go
+++ b/modules/caddyhttp/encode/gzip/gzip.go
@@ -20,7 +20,7 @@ import (
"fmt"
"strconv"
- "github.com/caddyserver/caddy/caddyconfig/caddyfile"
+ "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/modules/caddyhttp/encode"
)
diff --git a/modules/caddyhttp/encode/zstd/zstd.go b/modules/caddyhttp/encode/zstd/zstd.go
index 1ec2337..3622628 100644
--- a/modules/caddyhttp/encode/zstd/zstd.go
+++ b/modules/caddyhttp/encode/zstd/zstd.go
@@ -15,7 +15,7 @@
package caddyzstd
import (
- "github.com/caddyserver/caddy/caddyconfig/caddyfile"
+ "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/modules/caddyhttp/encode"
"github.com/klauspost/compress/zstd"
diff --git a/modules/caddyhttp/fileserver/caddyfile.go b/modules/caddyhttp/fileserver/caddyfile.go
index 49c5728..7d9ddd9 100644
--- a/modules/caddyhttp/fileserver/caddyfile.go
+++ b/modules/caddyhttp/fileserver/caddyfile.go
@@ -15,8 +15,8 @@
package fileserver
import (
- "github.com/caddyserver/caddy/caddyconfig/caddyfile"
- "github.com/caddyserver/caddy/caddyconfig/httpcaddyfile"
+ "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
+ "github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile"
)
// UnmarshalCaddyfile sets up the handler from Caddyfile tokens. Syntax:
diff --git a/modules/caddyhttp/fileserver/matcher.go b/modules/caddyhttp/fileserver/matcher.go
index c2e38ca..eca0e8f 100644
--- a/modules/caddyhttp/fileserver/matcher.go
+++ b/modules/caddyhttp/fileserver/matcher.go
@@ -20,7 +20,7 @@ import (
"os"
"time"
- "github.com/caddyserver/caddy/caddyconfig/caddyfile"
+ "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/modules/caddyhttp"
)
diff --git a/modules/caddyhttp/headers/caddyfile.go b/modules/caddyhttp/headers/caddyfile.go
index 03f9e68..8d320e5 100644
--- a/modules/caddyhttp/headers/caddyfile.go
+++ b/modules/caddyhttp/headers/caddyfile.go
@@ -18,8 +18,8 @@ import (
"net/http"
"strings"
- "github.com/caddyserver/caddy/caddyconfig/caddyfile"
- "github.com/caddyserver/caddy/caddyconfig/httpcaddyfile"
+ "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
+ "github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile"
)
// UnmarshalCaddyfile sets up the handler from Caddyfile tokens. Syntax:
diff --git a/modules/caddyhttp/reverseproxy/module.go b/modules/caddyhttp/reverseproxy/module.go
index 0bae58e..ff5786c 100755
--- a/modules/caddyhttp/reverseproxy/module.go
+++ b/modules/caddyhttp/reverseproxy/module.go
@@ -15,8 +15,8 @@
package reverseproxy
import (
- "github.com/caddyserver/caddy/caddyconfig/caddyfile"
- "github.com/caddyserver/caddy/caddyconfig/httpcaddyfile"
+ "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
+ "github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile"
"github.com/caddyserver/caddy/v2"
)
diff --git a/modules/caddyhttp/rewrite/caddyfile.go b/modules/caddyhttp/rewrite/caddyfile.go
index e2111a2..a067fe1 100644
--- a/modules/caddyhttp/rewrite/caddyfile.go
+++ b/modules/caddyhttp/rewrite/caddyfile.go
@@ -15,8 +15,8 @@
package rewrite
import (
- "github.com/caddyserver/caddy/caddyconfig/caddyfile"
- "github.com/caddyserver/caddy/caddyconfig/httpcaddyfile"
+ "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
+ "github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile"
)
// UnmarshalCaddyfile sets up the handler from Caddyfile tokens. Syntax:
diff --git a/modules/caddyhttp/templates/caddyfile.go b/modules/caddyhttp/templates/caddyfile.go
index 50bb3f8..d27b8e3 100644
--- a/modules/caddyhttp/templates/caddyfile.go
+++ b/modules/caddyhttp/templates/caddyfile.go
@@ -15,8 +15,8 @@
package templates
import (
- "github.com/caddyserver/caddy/caddyconfig/caddyfile"
- "github.com/caddyserver/caddy/caddyconfig/httpcaddyfile"
+ "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
+ "github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile"
)
// UnmarshalCaddyfile sets up the handler from Caddyfile tokens. Syntax: