diff options
Diffstat (limited to 'plugin/geoip/setup.go')
| -rw-r--r-- | plugin/geoip/setup.go | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/plugin/geoip/setup.go b/plugin/geoip/setup.go index 6883bbe2d..7f6e16f3e 100644 --- a/plugin/geoip/setup.go +++ b/plugin/geoip/setup.go @@ -26,6 +26,7 @@ func setup(c *caddy.Controller) error { func geoipParse(c *caddy.Controller) (*GeoIP, error) { var dbPath string + var edns0 bool for c.Next() { if !c.NextArg() { @@ -39,13 +40,16 @@ func geoipParse(c *caddy.Controller) (*GeoIP, error) { if len(c.RemainingArgs()) != 0 { return nil, c.ArgErr() } - // The plugin should not have any config block. - if c.NextBlock() { - return nil, c.Err("unexpected config block") + + for c.NextBlock() { + if c.Val() != "edns-subnet" { + return nil, c.Errf("unknown property %q", c.Val()) + } + edns0 = true } } - geoIP, err := newGeoIP(dbPath) + geoIP, err := newGeoIP(dbPath, edns0) if err != nil { return geoIP, c.Err(err.Error()) } |