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>
This commit is contained in:
parent
3a0c7c6153
commit
22c6e3e179
22 changed files with 28 additions and 114 deletions
|
@ -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()
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue