diff options
| author | Mohammed Al Sahaf <msaa1990@gmail.com> | 2019-08-22 21:26:48 +0300 |
|---|---|---|
| committer | Matt Holt <mholt@users.noreply.github.com> | 2019-08-22 12:26:48 -0600 |
| commit | a0fd2b6c0abbd9c121ecf779058fd348327b5e0c (patch) | |
| tree | 5bbeb04ec295b9d26c7934511171b1f8ca03f50c | |
| parent | c0da7d487abcdcd9761220d75400f75584482b5f (diff) | |
Fix SIV where /v2 was missing from caddyfile adapter work (#2721)
| -rw-r--r-- | caddyconfig/httpcaddyfile/addresses.go | 2 | ||||
| -rw-r--r-- | caddyconfig/httpcaddyfile/builtins.go | 4 | ||||
| -rw-r--r-- | modules/caddyhttp/fileserver/caddyfile.go | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/caddyconfig/httpcaddyfile/addresses.go b/caddyconfig/httpcaddyfile/addresses.go index 2adb818..5708783 100644 --- a/caddyconfig/httpcaddyfile/addresses.go +++ b/caddyconfig/httpcaddyfile/addresses.go @@ -22,7 +22,7 @@ import ( "strconv" "strings" - "github.com/caddyserver/caddy/caddyconfig/caddyfile" + "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile" "github.com/caddyserver/caddy/v2/modules/caddyhttp" "github.com/mholt/certmagic" ) diff --git a/caddyconfig/httpcaddyfile/builtins.go b/caddyconfig/httpcaddyfile/builtins.go index 0fdfcd5..db2eee5 100644 --- a/caddyconfig/httpcaddyfile/builtins.go +++ b/caddyconfig/httpcaddyfile/builtins.go @@ -21,8 +21,8 @@ import ( "net/http" "reflect" - "github.com/caddyserver/caddy/caddyconfig" - "github.com/caddyserver/caddy/modules/caddyhttp" + "github.com/caddyserver/caddy/v2/caddyconfig" + "github.com/caddyserver/caddy/v2/modules/caddyhttp" "github.com/caddyserver/caddy/v2/modules/caddytls" ) diff --git a/modules/caddyhttp/fileserver/caddyfile.go b/modules/caddyhttp/fileserver/caddyfile.go index 902bd14..7afcc9e 100644 --- a/modules/caddyhttp/fileserver/caddyfile.go +++ b/modules/caddyhttp/fileserver/caddyfile.go @@ -17,7 +17,7 @@ package fileserver import ( "encoding/json" - "github.com/caddyserver/caddy/modules/caddyhttp/rewrite" + "github.com/caddyserver/caddy/v2/modules/caddyhttp/rewrite" "github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile" "github.com/caddyserver/caddy/v2/modules/caddyhttp" ) |