From a0fd2b6c0abbd9c121ecf779058fd348327b5e0c Mon Sep 17 00:00:00 2001 From: Mohammed Al Sahaf Date: Thu, 22 Aug 2019 21:26:48 +0300 Subject: [PATCH] Fix SIV where /v2 was missing from caddyfile adapter work (#2721) --- caddyconfig/httpcaddyfile/addresses.go | 2 +- caddyconfig/httpcaddyfile/builtins.go | 4 ++-- 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 2adb818b..5708783e 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 0fdfcd5a..db2eee5e 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 902bd14c..7afcc9ef 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" )