summaryrefslogtreecommitdiff
path: root/caddyconfig
diff options
context:
space:
mode:
authorMatthew Holt <mholt@users.noreply.github.com>2019-09-11 12:02:35 -0600
committerMatthew Holt <mholt@users.noreply.github.com>2019-09-11 12:02:35 -0600
commite48d83452e42a6eb53f02213dd5981d02627b7b2 (patch)
treeb57f5f0a34aa39e434a8e24e12c43f89071a9841 /caddyconfig
parent2459c292a4d6fb0552eb9be3cecd955093ed853b (diff)
httpcaddyfile: Switch order; reverse_proxy comes before php_fastcgi
Diffstat (limited to 'caddyconfig')
-rw-r--r--caddyconfig/httpcaddyfile/directives.go2
-rw-r--r--caddyconfig/httpcaddyfile/httptype.go4
2 files changed, 1 insertions, 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) {