diff --git a/caddy/directives.go b/caddy/directives.go index 87f6233d8..fd5245085 100644 --- a/caddy/directives.go +++ b/caddy/directives.go @@ -69,6 +69,15 @@ var directiveOrder = []directive{ {"browse", setup.Browse}, } +// Directives returns the list of directives in order of priority. +func Directives() []string { + directives := make([]string, len(directiveOrder)) + for i, d := range directiveOrder { + directives[i] = d.name + } + return directives +} + // RegisterDirective adds the given directive to caddy's list of directives. // Pass the name of a directive you want it to be placed after, // otherwise it will be placed at the bottom of the stack. diff --git a/main.go b/main.go index dca6a87ba..abb1b3f39 100644 --- a/main.go +++ b/main.go @@ -14,7 +14,6 @@ import ( "github.com/mholt/caddy/caddy" "github.com/mholt/caddy/caddy/https" - "github.com/mholt/caddy/caddy/parse" "github.com/xenolf/lego/acme" "gopkg.in/natefinch/lumberjack.v2" ) @@ -80,7 +79,7 @@ func main() { os.Exit(0) } if directives { - for d := range parse.ValidDirectives { + for _, d := range caddy.Directives() { fmt.Println(d) } os.Exit(0)