aboutsummaryrefslogtreecommitdiff
path: root/plugin/template/setup.go
diff options
context:
space:
mode:
authorGravatar Miek Gieben <miek@miek.nl> 2019-07-02 16:23:47 +0100
committerGravatar GitHub <noreply@github.com> 2019-07-02 16:23:47 +0100
commit22c6e3e179303955b62276de4b48293b2e90506c (patch)
tree40d967c0de397ca81d505b3d450d3c59671d9700 /plugin/template/setup.go
parent3a0c7c61532db7f8e4ce79f99129201a79729525 (diff)
downloadcoredns-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/template/setup.go')
-rw-r--r--plugin/template/setup.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/plugin/template/setup.go b/plugin/template/setup.go
index 33eeb086f..85968c50b 100644
--- a/plugin/template/setup.go
+++ b/plugin/template/setup.go
@@ -74,6 +74,7 @@ func templateParse(c *caddy.Controller) (handler Handler, err error) {
templatePrefix := ""
t.answer = make([]*gotmpl.Template, 0)
+ t.upstream = upstream.New()
for c.NextBlock() {
switch c.Val() {
@@ -144,8 +145,8 @@ func templateParse(c *caddy.Controller) (handler Handler, err error) {
t.fall.SetZonesFromArgs(c.RemainingArgs())
case "upstream":
- c.RemainingArgs() // eat remaining args
- t.upstream = upstream.New()
+ // remove soon
+ c.RemainingArgs()
default:
return handler, c.ArgErr()
}