From 6706c9225a8dcb976785bdf2c35eb151d54ac18c Mon Sep 17 00:00:00 2001 From: Matthew Holt Date: Tue, 18 Jun 2019 11:13:12 -0600 Subject: Implement templates handler; various minor cleanups and bug fixes --- cmd/caddy/main.go | 26 ++++++++++++++++++++++++++ cmd/caddy2/main.go | 25 ------------------------- 2 files changed, 26 insertions(+), 25 deletions(-) create mode 100644 cmd/caddy/main.go delete mode 100644 cmd/caddy2/main.go (limited to 'cmd') diff --git a/cmd/caddy/main.go b/cmd/caddy/main.go new file mode 100644 index 0000000..463b1b9 --- /dev/null +++ b/cmd/caddy/main.go @@ -0,0 +1,26 @@ +package main + +import ( + caddycmd "github.com/caddyserver/caddy/cmd" + + // this is where modules get plugged in + _ "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/caddyhttp/templates" + _ "github.com/caddyserver/caddy/modules/caddytls" + _ "github.com/caddyserver/caddy/modules/caddytls/standardstek" +) + +func main() { + caddycmd.Main() +} diff --git a/cmd/caddy2/main.go b/cmd/caddy2/main.go deleted file mode 100644 index c2320ef..0000000 --- a/cmd/caddy2/main.go +++ /dev/null @@ -1,25 +0,0 @@ -package main - -import ( - caddycmd "github.com/caddyserver/caddy/cmd" - - // this is where modules get plugged in - _ "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() { - caddycmd.Main() -} -- cgit v1.2.3