From: Pieter Lexis <pieterlexis@users.noreply.github.com>
Date: Thu, 21 Jun 2018 15:47:10 +0000 (+0200)
Subject: Merge pull request #6733 from rgacogne/rec-multi-rpz
X-Git-Tag: dnsdist-1.3.1~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=45fcadcf2627895ae2e8ecf3e1cafa62539814b5;p=pdns

Merge pull request #6733 from rgacogne/rec-multi-rpz

rec: Add support for multiple rpz masters as failover
---

45fcadcf2627895ae2e8ecf3e1cafa62539814b5
diff --cc regression-tests.recursor-dnssec/test_RPZ.py
index 42fbca6bd,b2ca1bf96..f6c75c0b4
--- a/regression-tests.recursor-dnssec/test_RPZ.py
+++ b/regression-tests.recursor-dnssec/test_RPZ.py
@@@ -169,22 -150,13 +169,23 @@@ class RPZRecursorTest(RecursorTest)
  
      global rpzServerPort
      _lua_config_file = """
-     rpzMaster('127.0.0.1:%d', 'zone.rpz.', { refresh=1 })
+     -- The first server is a bogus one, to test that we correctly fail over to the second one
+     rpzMaster({'127.0.0.1:9999', '127.0.0.1:%d'}, 'zone.rpz.', { refresh=1 })
      """ % (rpzServerPort)
 +    _wsPort = 8042
 +    _wsTimeout = 2
 +    _wsPassword = 'secretpassword'
 +    _apiKey = 'secretapikey'
      _confdir = 'RPZ'
      _config_template = """
 -auth-zones=example=configs/%s/example.zone""" % _confdir
 -
 +auth-zones=example=configs/%s/example.zone
 +webserver=yes
 +webserver-port=%d
 +webserver-address=127.0.0.1
 +webserver-password=%s
 +api-key=%s
 +""" % (_confdir, _wsPort, _wsPassword, _apiKey)
 +    _xfrDone = 0
  
      @classmethod
      def generateRecursorConfig(cls, confdir):