From d3dfd71e2d8cb56113a36d55df57864d16e5f6c2 Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Mon, 15 Apr 2019 10:05:15 +0200 Subject: [PATCH] rename supermaster to superslave, and mention in upgrade notes --- docs/modes-of-operation.rst | 6 +++--- docs/settings.rst | 4 ++-- docs/upgrading.rst | 5 +++++ pdns/common_startup.cc | 2 +- pdns/packethandler.cc | 2 +- regression-tests.nobackend/supermaster-signed/command | 2 +- regression-tests.nobackend/supermaster-unsigned/command | 2 +- 7 files changed, 14 insertions(+), 9 deletions(-) diff --git a/docs/modes-of-operation.rst b/docs/modes-of-operation.rst index bf76cf28e9..4323d1a6ef 100644 --- a/docs/modes-of-operation.rst +++ b/docs/modes-of-operation.rst @@ -201,10 +201,10 @@ itself as a slave for that zone. Before a supermaster notification succeeds, the following conditions must be met: - - :ref:`setting-supermaster` support must be enabled + - :ref:`setting-superslave` support must be enabled - The supermaster must carry a SOA record for the notified domain - - The supermaster IP must be present in the 'supermaster' table - - The set of NS records for the domain, as retrieved by the slave from the supermaster, must include the name that goes with the IP address in the supermaster table + - The supermaster IP must be present in the 'supermasters' table + - The set of NS records for the domain, as retrieved by the slave from the supermaster, must include the name that goes with the IP address in the supermasters table - If your master sends signed NOTIFY it will mark that TSIG key as the TSIG key used for retrieval as well - If you turn off :ref:`setting-allow-unsigned-supermaster`, then your supermaster(s) are required to sign their notifications. diff --git a/docs/settings.rst b/docs/settings.rst index eab1244d27..2f52848527 100644 --- a/docs/settings.rst +++ b/docs/settings.rst @@ -1449,9 +1449,9 @@ This path will also contain the pidfile for this instance of PowerDNS called ``pdns.pid`` by default. See :ref:`setting-config-name` and :doc:`Virtual Hosting ` how this can differ. -.. _setting-supermaster: +.. _setting-superslave: -``supermaster`` +``superslave`` --------------- - Boolean diff --git a/docs/upgrading.rst b/docs/upgrading.rst index 82ca980754..b0b7ba64ff 100644 --- a/docs/upgrading.rst +++ b/docs/upgrading.rst @@ -8,6 +8,11 @@ Please upgrade to the PowerDNS Authoritative Server 4.0.0 from 3.4.2+. See the `3.X `__ upgrade notes if your version is older than 3.4.2. +4.1.X to 4.2.0 +-------------- + +- Superslave operation is no longer enabled by default, use :ref:`setting-superslave` to enable. This setting was called ``supermaster`` in some 4.2.0 prereleases. + 4.1.0 to 4.1.1 -------------- diff --git a/pdns/common_startup.cc b/pdns/common_startup.cc index e7f6f5ab95..bd57fc5423 100644 --- a/pdns/common_startup.cc +++ b/pdns/common_startup.cc @@ -137,7 +137,7 @@ void declareArguments() ::arg().setSwitch("slave","Act as a slave")="no"; ::arg().setSwitch("master","Act as a master")="no"; - ::arg().setSwitch("supermaster", "Act as a supermaster")="no"; + ::arg().setSwitch("superslave", "Act as a superslave")="no"; ::arg().setSwitch("disable-axfr-rectify","Disable the rectify step during an outgoing AXFR. Only required for regression testing.")="no"; ::arg().setSwitch("guardian","Run within a guardian process")="no"; ::arg().setSwitch("prevent-self-notification","Don't send notifications to what we think is ourself")="yes"; diff --git a/pdns/packethandler.cc b/pdns/packethandler.cc index e7189ece00..fbd5b6da20 100644 --- a/pdns/packethandler.cc +++ b/pdns/packethandler.cc @@ -887,7 +887,7 @@ int PacketHandler::processNotify(DNSPacket *p) // DomainInfo di; if(!B.getDomainInfo(p->qdomain, di, false) || !di.backend) { - if(::arg().mustDo("supermaster")) { + if(::arg().mustDo("superslave")) { g_log<qdomain<<" from "<getRemote()<<" for which we are not authoritative, trying supermaster"<getTSIGKeyname()); } diff --git a/regression-tests.nobackend/supermaster-signed/command b/regression-tests.nobackend/supermaster-signed/command index 6eb46127f0..ffb0da45c5 100755 --- a/regression-tests.nobackend/supermaster-signed/command +++ b/regression-tests.nobackend/supermaster-signed/command @@ -94,7 +94,7 @@ start_slave() $RUNWRAPPER $PDNS2 --daemon=no --local-port=$slaveport --config-dir=. --module-dir=../regression-tests/modules \ --config-name=gsqlite3-slave --socket-dir=./ --no-shuffle --local-address=127.0.0.2 --local-ipv6='' \ - --slave --retrieval-threads=4 --slave=yes --supermaster=yes --query-local-address=127.0.0.2 \ + --slave --retrieval-threads=4 --slave=yes --superslave=yes --query-local-address=127.0.0.2 \ --slave-cycle-interval=300 --allow-unsigned-notify=no --allow-unsigned-supermaster=no & } diff --git a/regression-tests.nobackend/supermaster-unsigned/command b/regression-tests.nobackend/supermaster-unsigned/command index 86dde03927..6311fd2d01 100755 --- a/regression-tests.nobackend/supermaster-unsigned/command +++ b/regression-tests.nobackend/supermaster-unsigned/command @@ -85,7 +85,7 @@ start_slave() $RUNWRAPPER $PDNS2 --daemon=no --local-port=$slaveport --config-dir=. --module-dir=../regression-tests/modules \ --config-name=gsqlite3-slave --socket-dir=./ --no-shuffle --local-address=127.0.0.2 --local-ipv6= \ - --slave --retrieval-threads=4 --slave=yes --supermaster=yes --query-local-address=127.0.0.2 \ + --slave --retrieval-threads=4 --slave=yes --superslave=yes --query-local-address=127.0.0.2 \ --slave-cycle-interval=300 --dname-processing & } -- 2.47.2