diff options
author | 2019-07-02 16:23:47 +0100 | |
---|---|---|
committer | 2019-07-02 16:23:47 +0100 | |
commit | 22c6e3e179303955b62276de4b48293b2e90506c (patch) | |
tree | 40d967c0de397ca81d505b3d450d3c59671d9700 /plugin/auto/setup.go | |
parent | 3a0c7c61532db7f8e4ce79f99129201a79729525 (diff) | |
download | coredns-22c6e3e179303955b62276de4b48293b2e90506c.tar.gz coredns-22c6e3e179303955b62276de4b48293b2e90506c.tar.zst coredns-22c6e3e179303955b62276de4b48293b2e90506c.zip |
plugins: set upstream unconditionally (#2956)
`upstream` is not needed as a setting; just set if unconditionally and
remove all documentation and tests for it.
At some point we want remove the hanlding for `upstream` as well and
error out on seeing it.
Signed-off-by: Miek Gieben <miek@miek.nl>
Diffstat (limited to 'plugin/auto/setup.go')
-rw-r--r-- | plugin/auto/setup.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugin/auto/setup.go b/plugin/auto/setup.go index d6c4f8290..96e15bffe 100644 --- a/plugin/auto/setup.go +++ b/plugin/auto/setup.go @@ -100,6 +100,7 @@ func autoParse(c *caddy.Controller) (Auto, error) { for i := range a.Zones.origins { a.Zones.origins[i] = plugin.Host(a.Zones.origins[i]).Normalize() } + a.loader.upstream = upstream.New() for c.NextBlock() { switch c.Val() { @@ -148,8 +149,8 @@ func autoParse(c *caddy.Controller) (Auto, error) { a.loader.ReloadInterval = d case "upstream": + // remove soon c.RemainingArgs() // eat remaining args - a.loader.upstream = upstream.New() case "transfer": t, _, e := parse.Transfer(c, false) |