From ce45353e619dfa364c7100fe1a4f7638a23b9745 Mon Sep 17 00:00:00 2001
From: Matthew Holt <mholt@users.noreply.github.com>
Date: Wed, 18 Mar 2020 15:51:31 -0600
Subject: [PATCH] Little tweaky tweaks

---
 caddyconfig/httpcaddyfile/builtins.go | 1 +
 caddyconfig/httpcaddyfile/httptype.go | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/caddyconfig/httpcaddyfile/builtins.go b/caddyconfig/httpcaddyfile/builtins.go
index 26abf3c6..c354f842 100644
--- a/caddyconfig/httpcaddyfile/builtins.go
+++ b/caddyconfig/httpcaddyfile/builtins.go
@@ -102,6 +102,7 @@ func parseRoot(h Helper) ([]ConfigValue, error) {
 //         alpn      <values...>
 //         load      <paths...>
 //         ca        <acme_ca_endpoint>
+//         ca_root   <pem_file>
 //         dns       <provider_name>
 //         on_demand
 //     }
diff --git a/caddyconfig/httpcaddyfile/httptype.go b/caddyconfig/httpcaddyfile/httptype.go
index 473aee3a..50f32526 100644
--- a/caddyconfig/httpcaddyfile/httptype.go
+++ b/caddyconfig/httpcaddyfile/httptype.go
@@ -282,6 +282,8 @@ func (ServerType) evaluateGlobalOptionsBlock(serverBlocks []serverBlock, options
 		var err error
 		disp := caddyfile.NewDispenser(segment)
 		switch dir {
+		case "debug":
+			val = true
 		case "http_port":
 			val, err = parseOptHTTPPort(disp)
 		case "https_port":
@@ -300,8 +302,6 @@ func (ServerType) evaluateGlobalOptionsBlock(serverBlocks []serverBlock, options
 			val, err = parseOptSingleString(disp)
 		case "admin":
 			val, err = parseOptAdmin(disp)
-		case "debug":
-			options["debug"] = true
 		case "on_demand_tls":
 			val, err = parseOptOnDemand(disp)
 		case "local_certs":