@marcel91200 / caddy Mirror · read-only / commits / c4159ef7
Fork 0

Fast and extensible multi-platform HTTP/1-2-3 web server with automatic HTTPS

Mirrored from https://github.com/Slazee/caddy.git

Synced Nov 14, 05:15 UTC

Fix module-related errors

Matthew Holt committed Aug 9, 2019 at 12:19 UTC c4159ef76d279d6a84257b24dbe97430af32eb1e
13 files changed +23 -23
caddy.go
+2 -2
@@ -227,10 +227,10 @@ func goModule(mod *debug.Module) *debug.Module {
227 // once that issue is fixed, we should just be able to use bi.Main... hopefully.
228 for _, dep := range bi.Deps {
229 if dep.Path == mod.Path {
230 - return *dep
230 + return dep
231 }
232 }
233 - return bi.Main
233 + return &bi.Main
234 }
235 return mod
236 }
go.mod
+1 -1
@@ -16,7 +16,7 @@ require (
16 github.com/imdario/mergo v0.3.7 // indirect
17 github.com/klauspost/compress v1.7.1-0.20190613161414-0b31f265a57b
18 github.com/klauspost/cpuid v1.2.1
19 - github.com/mholt/certmagic v0.6.2-0.20190624175158-6a42ef9fe8c2
19 + github.com/mholt/certmagic v0.6.2
20 github.com/mitchellh/go-ps v0.0.0-20170309133038-4fdf99ab2936
21 github.com/rs/cors v1.6.0
22 github.com/russross/blackfriday/v2 v2.0.1
go.sum
+2 -2
@@ -32,8 +32,8 @@ github.com/klauspost/compress v1.7.1-0.20190613161414-0b31f265a57b/go.mod h1:RyI
32 github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
33 github.com/klauspost/cpuid v1.2.1 h1:vJi+O/nMdFt0vqm8NZBI6wzALWdA2X+egi0ogNyrC/w=
34 github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
35 -github.com/mholt/certmagic v0.6.2-0.20190624175158-6a42ef9fe8c2 h1:xKE9kZ5C8gelJC3+BNM6LJs1x21rivK7yxfTZMAuY2s=
36 -github.com/mholt/certmagic v0.6.2-0.20190624175158-6a42ef9fe8c2/go.mod h1:g4cOPxcjV0oFq3qwpjSA30LReKD8AoIfwAY9VvG35NY=
35 +github.com/mholt/certmagic v0.6.2 h1:yy9cKm3rtxdh12SW4E51lzG3Eo6N59LEOfBQ0CTnMms=
36 +github.com/mholt/certmagic v0.6.2/go.mod h1:g4cOPxcjV0oFq3qwpjSA30LReKD8AoIfwAY9VvG35NY=
37 github.com/miekg/dns v1.1.3 h1:1g0r1IvskvgL8rR+AcHzUA+oFmGcQlaIm4IqakufeMM=
38 github.com/miekg/dns v1.1.3/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
39 github.com/mitchellh/go-ps v0.0.0-20170309133038-4fdf99ab2936 h1:kw1v0NlnN+GZcU8Ma8CLF2Zzgjfx95gs3/GN3vYAPpo=
modules/caddyhttp/encode/brotli/brotli.go
+1 -1
@@ -19,7 +19,7 @@ import (
19 "strconv"
20
21 "github.com/andybalholm/brotli"
22 - "github.com/caddyserver/caddy/caddyconfig/caddyfile"
22 + "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
23 "github.com/caddyserver/caddy/v2"
24 "github.com/caddyserver/caddy/v2/modules/caddyhttp/encode"
25 )
modules/caddyhttp/encode/caddyfile.go
+4 -4
@@ -18,10 +18,10 @@ import (
18 "encoding/json"
19 "fmt"
20
21 - "github.com/caddyserver/caddy"
22 - "github.com/caddyserver/caddy/caddyconfig"
23 - "github.com/caddyserver/caddy/caddyconfig/caddyfile"
24 - "github.com/caddyserver/caddy/caddyconfig/httpcaddyfile"
21 + "github.com/caddyserver/caddy/v2"
22 + "github.com/caddyserver/caddy/v2/caddyconfig"
23 + "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
24 + "github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile"
25 )
26
27 // UnmarshalCaddyfile sets up the handler from Caddyfile tokens. Syntax:
modules/caddyhttp/encode/gzip/gzip.go
+1 -1
@@ -20,7 +20,7 @@ import (
20 "fmt"
21 "strconv"
22
23 - "github.com/caddyserver/caddy/caddyconfig/caddyfile"
23 + "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
24 "github.com/caddyserver/caddy/v2"
25 "github.com/caddyserver/caddy/v2/modules/caddyhttp/encode"
26 )
modules/caddyhttp/encode/zstd/zstd.go
+1 -1
@@ -15,7 +15,7 @@
15 package caddyzstd
16
17 import (
18 - "github.com/caddyserver/caddy/caddyconfig/caddyfile"
18 + "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
19 "github.com/caddyserver/caddy/v2"
20 "github.com/caddyserver/caddy/v2/modules/caddyhttp/encode"
21 "github.com/klauspost/compress/zstd"
modules/caddyhttp/fileserver/caddyfile.go
+2 -2
@@ -15,8 +15,8 @@
15 package fileserver
16
17 import (
18 - "github.com/caddyserver/caddy/caddyconfig/caddyfile"
19 - "github.com/caddyserver/caddy/caddyconfig/httpcaddyfile"
18 + "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
19 + "github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile"
20 )
21
22 // UnmarshalCaddyfile sets up the handler from Caddyfile tokens. Syntax:
modules/caddyhttp/fileserver/matcher.go
+1 -1
@@ -20,7 +20,7 @@ import (
20 "os"
21 "time"
22
23 - "github.com/caddyserver/caddy/caddyconfig/caddyfile"
23 + "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
24 "github.com/caddyserver/caddy/v2"
25 "github.com/caddyserver/caddy/v2/modules/caddyhttp"
26 )
modules/caddyhttp/headers/caddyfile.go
+2 -2
@@ -18,8 +18,8 @@ import (
18 "net/http"
19 "strings"
20
21 - "github.com/caddyserver/caddy/caddyconfig/caddyfile"
22 - "github.com/caddyserver/caddy/caddyconfig/httpcaddyfile"
21 + "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
22 + "github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile"
23 )
24
25 // UnmarshalCaddyfile sets up the handler from Caddyfile tokens. Syntax:
modules/caddyhttp/reverseproxy/module.go
+2 -2
@@ -15,8 +15,8 @@
15 package reverseproxy
16
17 import (
18 - "github.com/caddyserver/caddy/caddyconfig/caddyfile"
19 - "github.com/caddyserver/caddy/caddyconfig/httpcaddyfile"
18 + "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
19 + "github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile"
20 "github.com/caddyserver/caddy/v2"
21 )
22
modules/caddyhttp/rewrite/caddyfile.go
+2 -2
@@ -15,8 +15,8 @@
15 package rewrite
16
17 import (
18 - "github.com/caddyserver/caddy/caddyconfig/caddyfile"
19 - "github.com/caddyserver/caddy/caddyconfig/httpcaddyfile"
18 + "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
19 + "github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile"
20 )
21
22 // UnmarshalCaddyfile sets up the handler from Caddyfile tokens. Syntax:
modules/caddyhttp/templates/caddyfile.go
+2 -2
@@ -15,8 +15,8 @@
15 package templates
16
17 import (
18 - "github.com/caddyserver/caddy/caddyconfig/caddyfile"
19 - "github.com/caddyserver/caddy/caddyconfig/httpcaddyfile"
18 + "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
19 + "github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile"
20 )
21
22 // UnmarshalCaddyfile sets up the handler from Caddyfile tokens. Syntax: