diff options
| author | Matthew Holt <mholt@users.noreply.github.com> | 2019-06-14 11:58:28 -0600 |
|---|---|---|
| committer | Matthew Holt <mholt@users.noreply.github.com> | 2019-06-14 11:58:28 -0600 |
| commit | 5137859e47678aae81e178ca7d164f9e2b4e3121 (patch) | |
| tree | f0e5cb9b9a4ad5dc03b53127fcea2a536bd6ee27 /cmd | |
| parent | b8e7453fef3dac6036403bc384eec96becff5114 (diff) | |
Rename caddy2 -> caddy
Removes the version from the package name
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/caddy2/main.go | 30 | ||||
| -rw-r--r-- | cmd/run.go | 6 |
2 files changed, 18 insertions, 18 deletions
diff --git a/cmd/caddy2/main.go b/cmd/caddy2/main.go index 310b8c1..c2320ef 100644 --- a/cmd/caddy2/main.go +++ b/cmd/caddy2/main.go @@ -1,23 +1,23 @@ package main import ( - caddycmd "github.com/caddyserver/caddy2/cmd" + caddycmd "github.com/caddyserver/caddy/cmd" // this is where modules get plugged in - _ "github.com/caddyserver/caddy2/modules/caddyhttp" - _ "github.com/caddyserver/caddy2/modules/caddyhttp/caddylog" - _ "github.com/caddyserver/caddy2/modules/caddyhttp/encode" - _ "github.com/caddyserver/caddy2/modules/caddyhttp/encode/brotli" - _ "github.com/caddyserver/caddy2/modules/caddyhttp/encode/gzip" - _ "github.com/caddyserver/caddy2/modules/caddyhttp/encode/zstd" - _ "github.com/caddyserver/caddy2/modules/caddyhttp/fileserver" - _ "github.com/caddyserver/caddy2/modules/caddyhttp/headers" - _ "github.com/caddyserver/caddy2/modules/caddyhttp/markdown" - _ "github.com/caddyserver/caddy2/modules/caddyhttp/requestbody" - _ "github.com/caddyserver/caddy2/modules/caddyhttp/reverseproxy" - _ "github.com/caddyserver/caddy2/modules/caddyhttp/rewrite" - _ "github.com/caddyserver/caddy2/modules/caddytls" - _ "github.com/caddyserver/caddy2/modules/caddytls/standardstek" + _ "github.com/caddyserver/caddy/modules/caddyhttp" + _ "github.com/caddyserver/caddy/modules/caddyhttp/caddylog" + _ "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/caddytls" + _ "github.com/caddyserver/caddy/modules/caddytls/standardstek" ) func main() { @@ -4,18 +4,18 @@ import ( "flag" "log" - "github.com/caddyserver/caddy2" + "github.com/caddyserver/caddy" ) // Main executes the main function of the caddy command. func Main() { flag.Parse() - err := caddy2.StartAdmin(*listenAddr) + err := caddy.StartAdmin(*listenAddr) if err != nil { log.Fatal(err) } - defer caddy2.StopAdmin() + defer caddy.StopAdmin() log.Println("Caddy 2 admin endpoint listening on", *listenAddr) |