httpcaddyfile: Allow "admin off" option

mholt · mholt · commit 03ab55b51afe · 2020-02-27T21:04:28.000-07:00
diff --git a/caddyconfig/httpcaddyfile/httptype.go b/caddyconfig/httpcaddyfile/httptype.go
@@ -327,7 +327,11 @@ func (st ServerType) Setup(originalServerBlocks []caddyfile.ServerBlock,
 			&warnings)
 	}
 	if adminConfig, ok := options["admin"].(string); ok && adminConfig != "" {
-		cfg.Admin = &caddy.AdminConfig{Listen: adminConfig}
+		if adminConfig == "off" {
+			cfg.Admin = &caddy.AdminConfig{Disabled: true}
+		} else {
+			cfg.Admin = &caddy.AdminConfig{Listen: adminConfig}
+		}
 	}
 	if len(customLogs) > 0 {
 		if cfg.Logging == nil {

Original file line number	Diff line number	Diff line change
`@@ -327,7 +327,11 @@ func (st ServerType) Setup(originalServerBlocks []caddyfile.ServerBlock,`
`327`	`327`	`&warnings)`
`328`	`328`	`}`
`329`	`329`	`if adminConfig, ok := options["admin"].(string); ok && adminConfig != "" {`
`330`		`- cfg.Admin = &caddy.AdminConfig{Listen: adminConfig}`
	`330`	`+ if adminConfig == "off" {`
	`331`	`+ cfg.Admin = &caddy.AdminConfig{Disabled: true}`
	`332`	`+ } else {`
	`333`	`+ cfg.Admin = &caddy.AdminConfig{Listen: adminConfig}`
	`334`	`+ }`
`331`	`335`	`}`
`332`	`336`	`if len(customLogs) > 0 {`
`333`	`337`	`if cfg.Logging == nil {`