Merge branch 'master' into acmev2

3afb1ae3 · Matthew Holt · 37c852c3 · 64c9f209 · 3afb1ae3
Commit 3afb1ae3 authored Mar 17, 2018 by Matthew Holt
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

caddyhttp/httpserver/plugin.go caddyhttp/httpserver/plugin.go +1 -0

No files found.
--- a/caddyhttp/httpserver/plugin.go
+++ b/caddyhttp/httpserver/plugin.go
@@ -500,6 +500,7 @@ var directives = []string{
 	"ext",
 	"gzip",
 	"header",
+	"geoip", // github.com/kodnaplakal/caddy-geoip
 	"errors",
 	"authz",        // github.com/casbin/caddy-authz
 	"filter",       // github.com/echocat/caddy-filter