For some reasons there was a dnsserver/middleware.go that defined the middleware handlers. This code was a repeat from middleware/middleware.go. Removed dnsserver/middleware.go and replaced all uses of dnsserver.Middleware with middleware.Middleware. Added dnsserver/address_test.go to test the zone normalization (and to improve the test coverage). The deleted file will also improve the test coverage :)
39 lines
884 B
Go
39 lines
884 B
Go
package dnsserver
|
|
|
|
import (
|
|
"github.com/miekg/coredns/middleware"
|
|
|
|
"github.com/mholt/caddy"
|
|
)
|
|
|
|
// Config configuration for a single server.
|
|
type Config struct {
|
|
// The zone of the site.
|
|
Zone string
|
|
|
|
// The hostname to bind listener to, defaults to the wildcard address
|
|
ListenHost string
|
|
|
|
// The port to listen on.
|
|
Port string
|
|
|
|
// Middleware stack.
|
|
Middleware []middleware.Middleware
|
|
|
|
// Compiled middleware stack.
|
|
middlewareChain middleware.Handler
|
|
}
|
|
|
|
// GetConfig gets the Config that corresponds to c.
|
|
// If none exist nil is returned.
|
|
func GetConfig(c *caddy.Controller) *Config {
|
|
ctx := c.Context().(*dnsContext)
|
|
if cfg, ok := ctx.keysToConfigs[c.Key]; ok {
|
|
return cfg
|
|
}
|
|
// we should only get here during tests because directive
|
|
// actions typically skip the server blocks where we make
|
|
// the configs.
|
|
ctx.saveConfig(c.Key, &Config{})
|
|
return GetConfig(c)
|
|
}
|