diff options
author | 2016-08-19 17:14:17 -0700 | |
---|---|---|
committer | 2016-08-19 17:14:17 -0700 | |
commit | 9ac3cab1b7b1b1e78f86ce3c6a80fbee312162e6 (patch) | |
tree | 437e9755927c33af16276ad2602a6da115f948cb /core/setup/cache.go | |
parent | a1989c35231b0e5ea271b2f68d82c1a63e697cd0 (diff) | |
download | coredns-9ac3cab1b7b1b1e78f86ce3c6a80fbee312162e6.tar.gz coredns-9ac3cab1b7b1b1e78f86ce3c6a80fbee312162e6.tar.zst coredns-9ac3cab1b7b1b1e78f86ce3c6a80fbee312162e6.zip |
Make CoreDNS a server type plugin for Caddy (#220)
* Make CoreDNS a server type plugin for Caddy
Remove code we don't need and port all middleware over. Fix all tests
and rework the documentation.
Also make `go generate` build a caddy binary which we then copy into
our directory. This means `go build`-builds remain working as-is.
And new etc instances in each etcd test for better isolation.
Fix more tests and rework test.Server with the newer support Caddy offers.
Fix Makefile to support new mode of operation.
Diffstat (limited to 'core/setup/cache.go')
-rw-r--r-- | core/setup/cache.go | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/core/setup/cache.go b/core/setup/cache.go deleted file mode 100644 index f5a1cf0d9..000000000 --- a/core/setup/cache.go +++ /dev/null @@ -1,53 +0,0 @@ -package setup - -import ( - "strconv" - - "github.com/miekg/coredns/middleware" - "github.com/miekg/coredns/middleware/cache" -) - -// Cache sets up the root file path of the server. -func Cache(c *Controller) (middleware.Middleware, error) { - ttl, zones, err := cacheParse(c) - if err != nil { - return nil, err - } - return func(next middleware.Handler) middleware.Handler { - return cache.NewCache(ttl, zones, next) - }, nil -} - -func cacheParse(c *Controller) (int, []string, error) { - var ( - err error - ttl int - ) - - for c.Next() { - if c.Val() == "cache" { - // cache [ttl] [zones..] - origins := c.ServerBlockHosts - args := c.RemainingArgs() - if len(args) > 0 { - origins = args - // first args may be just a number, then it is the ttl, if not it is a zone - t := origins[0] - ttl, err = strconv.Atoi(t) - if err == nil { - origins = origins[1:] - if len(origins) == 0 { - // There was *only* the ttl, revert back to server block - origins = c.ServerBlockHosts - } - } - } - - for i, _ := range origins { - origins[i] = middleware.Host(origins[i]).Normalize() - } - return ttl, origins, nil - } - } - return 0, nil, nil -} |