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:
Miek Gieben
2019-07-02 16:23:47 +01:00
committed by GitHub
parent 3a0c7c6153
commit 22c6e3e179
22 changed files with 28 additions and 114 deletions

View File

@@ -47,6 +47,7 @@ func setup(c *caddy.Controller) error {
func federationParse(c *caddy.Controller) (*Federation, error) {
fed := New()
fed.Upstream = upstream.New()
for c.Next() {
// federation [zones..]
@@ -64,8 +65,8 @@ func federationParse(c *caddy.Controller) (*Federation, error) {
x := c.Val()
switch x {
case "upstream":
// remove soon
c.RemainingArgs()
fed.Upstream = upstream.New()
default:
args := c.RemainingArgs()
if x := len(args); x != 1 {