From 4d4923249cc203278df8a9094c4b8ec81c8ff509 Mon Sep 17 00:00:00 2001 From: Wilhelm Wijkander Date: Tue, 13 Jun 2023 14:09:42 +0200 Subject: [PATCH] Add mentions to docs about removing zones from a catalog zone --- docs/catalog.rst | 1 + docs/manpages/pdnsutil.1.rst | 2 +- pdns/pdnsutil.cc | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/catalog.rst b/docs/catalog.rst index e0ffbdabb7..47f2335022 100644 --- a/docs/catalog.rst +++ b/docs/catalog.rst @@ -103,6 +103,7 @@ In the example below ``example.com`` is the member and ``catalog.example`` is th pdnsutil set-catalog example.com catalog.example Setting catalog values is supported in the :doc:`API `, by setting the ``catalog`` property in the zone properties. +Setting the catalog to an empty ``""`` removes the member zone from the catalog it is in. Each member zone may have one or more additional properties as defined in the draft. PowerDNS currently supports the following properties: diff --git a/docs/manpages/pdnsutil.1.rst b/docs/manpages/pdnsutil.1.rst index 4a7ec6e559..4dcdfef79d 100644 --- a/docs/manpages/pdnsutil.1.rst +++ b/docs/manpages/pdnsutil.1.rst @@ -253,7 +253,7 @@ set-options-json *ZONE* *JSON* set-option *ZONE* [*producer*|*consumer*] [*coo*|*unique*|*group*] *VALUE* [*VALUE* ...] Set or remove an option for *ZONE*. Providing an empty value removes an option. set-catalog *ZONE* *CATALOG* - Change the catalog of *ZONE* to *CATALOG* + Change the catalog of *ZONE* to *CATALOG*. Setting *CATALOG* to an empty "" removes *ZONE* from the catalog it is in. set-account *ZONE* *ACCOUNT* Change the account (owner) of *ZONE* to *ACCOUNT*. add-meta *ZONE* *ATTRIBUTE* *VALUE* [*VALUE*]... diff --git a/pdns/pdnsutil.cc b/pdns/pdnsutil.cc index 6e0466a970..3247804d7c 100644 --- a/pdns/pdnsutil.cc +++ b/pdns/pdnsutil.cc @@ -2622,7 +2622,7 @@ try cout << " [producer|consumer]" << endl; cout << " [coo|unique|group] VALUE" << endl; cout << " [VALUE ...]" << endl; - cout << "set-catalog ZONE CATALOG Change the catalog of ZONE to CATALOG" << endl; + cout << "set-catalog ZONE CATALOG Change the catalog of ZONE to CATALOG. Setting CATALOG to an empty "" removes ZONE from the catalog it is in" << endl; cout << "set-account ZONE ACCOUNT Change the account (owner) of ZONE to ACCOUNT" << endl; cout << "set-nsec3 ZONE ['PARAMS' [narrow]] Enable NSEC3 with PARAMS. Optionally narrow" << endl; cout << "set-presigned ZONE Use presigned RRSIGs from storage" << endl; -- 2.47.2