From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Mon, 4 Dec 2023 11:25:55 +0000 (+0100)
Subject: rec: Remove experimental warnings for YAML
X-Git-Tag: rec-5.0.0-rc1~1^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F13557%2Fhead;p=thirdparty%2Fpdns.git

rec: Remove experimental warnings for YAML

YAML settings are no longer experimental, but still only used if a `recursor.yml` file is found in the config dir.
---

diff --git a/pdns/recursordist/docs/appendices/example/conversion b/pdns/recursordist/docs/appendices/example/conversion
index f4b4d3d737..c9f74cdd17 100644
--- a/pdns/recursordist/docs/appendices/example/conversion
+++ b/pdns/recursordist/docs/appendices/example/conversion
@@ -1,4 +1,3 @@
-# THIS IS A PROOF OF CONCEPT! STRUCTURE, TYPES AND NAMES ARE SUBJECT TO CHANGE
 # Start of converted recursor.yml based on recursor.conf
 dnssec:
   validation: validate
diff --git a/pdns/recursordist/docs/manpages/rec_control.1.rst b/pdns/recursordist/docs/manpages/rec_control.1.rst
index 99b4a8317f..a576e58936 100644
--- a/pdns/recursordist/docs/manpages/rec_control.1.rst
+++ b/pdns/recursordist/docs/manpages/rec_control.1.rst
@@ -244,6 +244,9 @@ set-event-trace-enabled *NUM*
     Set logging of event trace messages, ``0`` = disabled, ``1`` = protobuf,
     ``2`` = log file, ``3`` = protobuf and log file.
 
+show-yaml [*FILE*]
+    Show Yaml representation of odl-style config.
+
 top-queries
     Shows the top-20 queries. Statistics are over the last
     'stats-ringbuffer-entries' queries.
@@ -338,9 +341,6 @@ wipe-cache *DOMAIN* [*DOMAIN*] [...]
 wipe-cache-typed *qtype* *DOMAIN* [*DOMAIN*] [...]
     Same as wipe-cache, but only wipe records of type *qtype*.
 
-show-yaml [*FILE*]
-    Show Yaml representation of config. EXPERIMENTAL.
-
 See also
 --------
 :manpage:`pdns_recursor(1)`
diff --git a/pdns/recursordist/rec_channel_rec.cc b/pdns/recursordist/rec_channel_rec.cc
index 186befa61c..230a7abbdd 100644
--- a/pdns/recursordist/rec_channel_rec.cc
+++ b/pdns/recursordist/rec_channel_rec.cc
@@ -2091,6 +2091,7 @@ static RecursorControlChannel::Answer help()
           "set-carbon-server                set a carbon server for telemetry\n"
           "set-dnssec-log-bogus SETTING     enable (SETTING=yes) or disable (SETTING=no) logging of DNSSEC validation failures\n"
           "set-event-trace-enabled SETTING  set logging of event trace messages, 0 = disabled, 1 = protobuf, 2 = log file, 3 = both\n"
+          "show-yaml [file]                 show yaml config derived from old-style config\n"
           "trace-regex [regex file]         emit resolution trace for matching queries (no arguments clears tracing)\n"
           "top-largeanswer-remotes          show top remotes receiving large answers\n"
           "top-queries                      show top queries\n"
@@ -2106,8 +2107,7 @@ static RecursorControlChannel::Answer help()
           "unload-lua-script                unload Lua script\n"
           "version                          return Recursor version number\n"
           "wipe-cache domain0 [domain1] ..  wipe domain data from cache\n"
-          "wipe-cache-typed type domain0 [domain1] ..  wipe domain data with qtype from cache\n"
-          "show-yaml [file]                 EXPERIMENTAL command to show yaml config derived from old-style config\n"};
+          "wipe-cache-typed type domain0 [domain1] ..  wipe domain data with qtype from cache\n"};
 }
 
 template <typename T>
diff --git a/pdns/recursordist/rec_control.cc b/pdns/recursordist/rec_control.cc
index 6264ae5122..c44525fcc0 100644
--- a/pdns/recursordist/rec_control.cc
+++ b/pdns/recursordist/rec_control.cc
@@ -202,7 +202,6 @@ static RecursorControlChannel::Answer showYAML(const std::string& path)
   try {
     std::string msg;
     auto converted = pdns::settings::rec::oldStyleSettingsFileToYaml(configName, true);
-    msg += "# THIS IS A PROOF OF CONCEPT! STRUCTURE, TYPES AND NAMES ARE SUBJECT TO CHANGE\n";
     msg += "# Start of converted recursor.yml based on " + configName + "\n";
     msg += converted;
     msg += "# Validation result: ";