Browse Source

Fix SIV where /v2 was missing from caddyfile adapter work (#2721)

master
Mohammed Al Sahaf 6 years ago
committed by Matt Holt
parent
commit
a0fd2b6c0a
  1. 2
      caddyconfig/httpcaddyfile/addresses.go
  2. 4
      caddyconfig/httpcaddyfile/builtins.go
  3. 2
      modules/caddyhttp/fileserver/caddyfile.go

2
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"
)

4
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"
)

2
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"
)

Loading…
Cancel
Save