From: Pieter Lexis Date: Thu, 2 May 2019 11:35:13 +0000 (+0200) Subject: Merge branch 'master' into docs-fix-numerous-things-big-chain X-Git-Tag: rec-4.2.0-rc1~45^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6252788c5ec378bdc1205e3d782b987e88507386;p=pdns Merge branch 'master' into docs-fix-numerous-things-big-chain --- 6252788c5ec378bdc1205e3d782b987e88507386 diff --cc docs/guides/basic-database.rst index 8396096ef,620e7a670..bca3a9cee --- a/docs/guides/basic-database.rst +++ b/docs/guides/basic-database.rst @@@ -46,11 -46,24 +46,25 @@@ Example: configuring MySQ -------------------------- Connect to MySQL as a user with sufficient privileges and issue the - following commands: + following commands below if you are running the 4.2 or master version of PowerDNS: + + Please find `the 4.1 schema on GitHub `_. + .. literalinclude:: ../../modules/gmysqlbackend/schema.mysql.sql + :language: SQL + We recommend you add the following MySQL statements as well. These will add + foreign key constraints to the tables in order to automate deletion of records, key + material, and other information upon deletion of a domain from the + domains table. These will only work on the InnoDB storage engine, but if you + followed our guide so far, that's exactly the engine we are using. + + The following SQL does the job: + + .. literalinclude:: ../../modules/gmysqlbackend/enable-foreign-keys.mysql.sql + + Now we have a database and an empty table. PowerDNS should now be able to launch in monitor mode and display no errors: diff --cc docs/modes-of-operation.rst index 26cfed842,4323d1a6e..9eafb750f --- a/docs/modes-of-operation.rst +++ b/docs/modes-of-operation.rst @@@ -205,12 -201,12 +205,13 @@@ 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 '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. ++ ++- :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 +- 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. .. warning:: If you use another PowerDNS server as master and have