summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorMatthew Holt <mholt@users.noreply.github.com>2019-07-02 12:37:06 -0600
committerMatthew Holt <mholt@users.noreply.github.com>2019-07-02 12:37:06 -0600
commitfdd871e1775d1b6d85de43e8ecf7ddc71a72c503 (patch)
tree958ba660c9970dc9d33487e1af6f50af8ff2e034 /cmd
parent94c28a2574e8691aa64d28d70e9c03cb1d049726 (diff)
go.mod: Append /v2 to module name; update all import paths
See https://github.com/golang/go/wiki/Modules#semantic-import-versioning
Diffstat (limited to 'cmd')
-rw-r--r--cmd/caddy/main.go30
-rw-r--r--cmd/commands.go2
2 files changed, 16 insertions, 16 deletions
diff --git a/cmd/caddy/main.go b/cmd/caddy/main.go
index 03f5748..c1824d7 100644
--- a/cmd/caddy/main.go
+++ b/cmd/caddy/main.go
@@ -15,23 +15,23 @@
package main
import (
- caddycmd "github.com/caddyserver/caddy/cmd"
+ caddycmd "github.com/caddyserver/caddy/v2/cmd"
// this is where modules get plugged in
- _ "github.com/caddyserver/caddy/modules/caddyhttp"
- _ "github.com/caddyserver/caddy/modules/caddyhttp/encode"
- _ "github.com/caddyserver/caddy/modules/caddyhttp/encode/brotli"
- _ "github.com/caddyserver/caddy/modules/caddyhttp/encode/gzip"
- _ "github.com/caddyserver/caddy/modules/caddyhttp/encode/zstd"
- _ "github.com/caddyserver/caddy/modules/caddyhttp/fileserver"
- _ "github.com/caddyserver/caddy/modules/caddyhttp/headers"
- _ "github.com/caddyserver/caddy/modules/caddyhttp/markdown"
- _ "github.com/caddyserver/caddy/modules/caddyhttp/requestbody"
- _ "github.com/caddyserver/caddy/modules/caddyhttp/reverseproxy"
- _ "github.com/caddyserver/caddy/modules/caddyhttp/rewrite"
- _ "github.com/caddyserver/caddy/modules/caddyhttp/templates"
- _ "github.com/caddyserver/caddy/modules/caddytls"
- _ "github.com/caddyserver/caddy/modules/caddytls/standardstek"
+ _ "github.com/caddyserver/caddy/v2/modules/caddyhttp"
+ _ "github.com/caddyserver/caddy/v2/modules/caddyhttp/encode"
+ _ "github.com/caddyserver/caddy/v2/modules/caddyhttp/encode/brotli"
+ _ "github.com/caddyserver/caddy/v2/modules/caddyhttp/encode/gzip"
+ _ "github.com/caddyserver/caddy/v2/modules/caddyhttp/encode/zstd"
+ _ "github.com/caddyserver/caddy/v2/modules/caddyhttp/fileserver"
+ _ "github.com/caddyserver/caddy/v2/modules/caddyhttp/headers"
+ _ "github.com/caddyserver/caddy/v2/modules/caddyhttp/markdown"
+ _ "github.com/caddyserver/caddy/v2/modules/caddyhttp/requestbody"
+ _ "github.com/caddyserver/caddy/v2/modules/caddyhttp/reverseproxy"
+ _ "github.com/caddyserver/caddy/v2/modules/caddyhttp/rewrite"
+ _ "github.com/caddyserver/caddy/v2/modules/caddyhttp/templates"
+ _ "github.com/caddyserver/caddy/v2/modules/caddytls"
+ _ "github.com/caddyserver/caddy/v2/modules/caddytls/standardstek"
)
func main() {
diff --git a/cmd/commands.go b/cmd/commands.go
index d25f445..f98b401 100644
--- a/cmd/commands.go
+++ b/cmd/commands.go
@@ -26,7 +26,7 @@ import (
"path/filepath"
"strings"
- "github.com/caddyserver/caddy"
+ "github.com/caddyserver/caddy/v2"
"github.com/mholt/certmagic"
"github.com/mitchellh/go-ps"
)