From e48d83452e42a6eb53f02213dd5981d02627b7b2 Mon Sep 17 00:00:00 2001 From: Matthew Holt Date: Wed, 11 Sep 2019 12:02:35 -0600 Subject: httpcaddyfile: Switch order; reverse_proxy comes before php_fastcgi --- caddyconfig/httpcaddyfile/directives.go | 2 +- caddyconfig/httpcaddyfile/httptype.go | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/caddyconfig/httpcaddyfile/directives.go b/caddyconfig/httpcaddyfile/directives.go index 31029c6..573db8d 100644 --- a/caddyconfig/httpcaddyfile/directives.go +++ b/caddyconfig/httpcaddyfile/directives.go @@ -34,8 +34,8 @@ var defaultDirectiveOrder = []string{ "templates", "redir", "static_response", // TODO: "reply" or "respond"? - "php_fastcgi", "reverse_proxy", + "php_fastcgi", "file_server", } diff --git a/caddyconfig/httpcaddyfile/httptype.go b/caddyconfig/httpcaddyfile/httptype.go index d183c7c..63cbf8d 100644 --- a/caddyconfig/httpcaddyfile/httptype.go +++ b/caddyconfig/httpcaddyfile/httptype.go @@ -37,10 +37,6 @@ func init() { type ServerType struct { } -// TODO: customize directive ordering - -// TODO: hide caddyfile when serving static files - // Setup makes a config from the tokens. func (st ServerType) Setup(originalServerBlocks []caddyfile.ServerBlock, options map[string]interface{}) (*caddy.Config, []caddyconfig.Warning, error) { -- cgit v1.2.3