OrgGo
/
caddy
mirror of https://github.com/caddyserver/caddy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

httpcaddyfile: Switch order; reverse_proxy comes before php_fastcgi

This commit is contained in:
Matthew Holt 2019-09-11 12:02:35 -06:00
parent 2459c292a4
commit e48d83452e
No known key found for this signature in database
GPG Key ID: 2A349DD577D586A5
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
caddyconfig/httpcaddyfile/directives.go
View File

@ -34,8 +34,8 @@ var defaultDirectiveOrder = []string{
"templates", "templates",
"redir", "redir",
"static_response", // TODO: "reply" or "respond"? "static_response", // TODO: "reply" or "respond"?
"php_fastcgi",
"reverse_proxy", "reverse_proxy",
"php_fastcgi",
"file_server", "file_server",
} }

4
caddyconfig/httpcaddyfile/httptype.go
View File

@ -37,10 +37,6 @@ func init() {
type ServerType struct { type ServerType struct {
} }
// TODO: customize directive ordering
// TODO: hide caddyfile when serving static files
// Setup makes a config from the tokens. // Setup makes a config from the tokens.
func (st ServerType) Setup(originalServerBlocks []caddyfile.ServerBlock, func (st ServerType) Setup(originalServerBlocks []caddyfile.ServerBlock,
options map[string]interface{}) (*caddy.Config, []caddyconfig.Warning, error) { options map[string]interface{}) (*caddy.Config, []caddyconfig.Warning, error) {