summaryrefslogtreecommitdiff
path: root/caddyconfig/httpcaddyfile
diff options
context:
space:
mode:
Diffstat (limited to 'caddyconfig/httpcaddyfile')
-rw-r--r--caddyconfig/httpcaddyfile/builtins.go10
-rw-r--r--caddyconfig/httpcaddyfile/directives.go3
2 files changed, 11 insertions, 2 deletions
diff --git a/caddyconfig/httpcaddyfile/builtins.go b/caddyconfig/httpcaddyfile/builtins.go
index 0ac436e..ff93b11 100644
--- a/caddyconfig/httpcaddyfile/builtins.go
+++ b/caddyconfig/httpcaddyfile/builtins.go
@@ -31,6 +31,7 @@ func init() {
RegisterDirective("root", parseRoot)
RegisterDirective("tls", parseTLS)
RegisterHandlerDirective("redir", parseRedir)
+ RegisterHandlerDirective("respond", parseRespond)
}
func parseBind(h Helper) ([]ConfigValue, error) {
@@ -253,3 +254,12 @@ func parseRedir(h Helper) (caddyhttp.MiddlewareHandler, error) {
Body: body,
}, nil
}
+
+func parseRespond(h Helper) (caddyhttp.MiddlewareHandler, error) {
+ sr := new(caddyhttp.StaticResponse)
+ err := sr.UnmarshalCaddyfile(h.Dispenser)
+ if err != nil {
+ return nil, err
+ }
+ return sr, nil
+}
diff --git a/caddyconfig/httpcaddyfile/directives.go b/caddyconfig/httpcaddyfile/directives.go
index 14c5f44..2f89f6d 100644
--- a/caddyconfig/httpcaddyfile/directives.go
+++ b/caddyconfig/httpcaddyfile/directives.go
@@ -25,7 +25,6 @@ import (
// defaultDirectiveOrder specifies the order
// to apply directives in HTTP routes.
-// TODO: finish the ability to customize this
var defaultDirectiveOrder = []string{
"rewrite",
"try_files",
@@ -34,7 +33,7 @@ var defaultDirectiveOrder = []string{
"encode",
"templates",
"redir",
- "static_response", // TODO: "reply" or "respond"?
+ "respond",
"reverse_proxy",
"php_fastcgi",
"file_server",