rec: make names of new udr settings consistent with existing scheme

diff --git a/pdns/recursordist/rec-main.cc b/pdns/recursordist/rec-main.cc
index 57004038e9857a306a36a49eaafe2828ec65fdc6..e8a9c29c16ece32af13f7d12df9bff3f71a870e8 100644 (file)
--- a/pdns/recursordist/rec-main.cc
+++ b/pdns/recursordist/rec-main.cc
@@ -906,9 +906,9 @@ static void setupNODGlobal()
   g_udrLog = ::arg().mustDo("unique-response-log");
   g_nod_pbtag = ::arg()["new-domain-pb-tag"];
   g_udr_pbtag = ::arg()["unique-response-pb-tag"];
-  parseIgnorelist(::arg()["udr-ignore-list"], g_udrDomainWL);
-  if (!::arg().isEmpty("udr-ignore-list-file")) {
-    parseIgnorelistFile(::arg()["udr-ignore-list-file"], g_udrDomainWL);
+  parseIgnorelist(::arg()["unique-response-ignore-list"], g_udrDomainWL);
+  if (!::arg().isEmpty("unique-response-ignore-list-file")) {
+    parseIgnorelistFile(::arg()["unique-response-ignore-list-file"], g_udrDomainWL);
   }
 }
 #endif /* NOD_ENABLED */

diff --git a/pdns/recursordist/settings/table.py b/pdns/recursordist/settings/table.py
index e029d9c072ea654098a7e62ea9145f3f8656a547..9255c98ff9ab7c916f6488d985bd0c997dd505e5 100644 (file)
--- a/pdns/recursordist/settings/table.py
+++ b/pdns/recursordist/settings/table.py
@@ -1817,33 +1817,6 @@ feature.
 Path to a file with a list of domains. File should have one domain per line,
 with no extra characters or comments.
 See :ref:`setting-new-domain-ignore-list`.
- ''',
-    'versionadded': '5.1.0'
-    },
-    {
-        'name' : 'udr_ignore_list',
-        'section' : 'nod',
-        'type' : LType.ListStrings,
-        'default' : '',
-        'help' : 'List of domains (and implicitly all subdomains) which will never be considered for UDR',
-        'doc' : '''
-This setting is a list of all domains (and implicitly all subdomains)
-that will never be considered for a new unique domain request.
-For example, if the domain 'example.com' is in the list, then 'foo.bar.example.com'
-will never be considered for a new unique domain request.
- ''',
-    'versionadded': '5.1.0'
-    },
-    {
-        'name' : 'udr_ignore_list_file',
-        'section' : 'nod',
-        'type' : LType.String,
-        'default' : '',
-        'help' : 'File with list of domains (and implicitly all subdomains) which will never be considered for UDR',
-        'doc' : '''
-Path to a file with a list of domains. File should have one domain per line,
-with no extra characters or comments.
-See :ref:`setting-udr-ignore-list`.
  ''',
     'versionadded': '5.1.0'
     },
@@ -3040,6 +3013,33 @@ a unique DNS response is observed.
  ''',
     'versionadded': '4.2.0'
     },
+    {
+        'name' : 'unique_response_ignore_list',
+        'section' : 'nod',
+        'type' : LType.ListStrings,
+        'default' : '',
+        'help' : 'List of domains (and implicitly all subdomains) which will never be considered for UDR',
+        'doc' : '''
+This setting is a list of all domains (and implicitly all subdomains)
+that will never be considered for a new unique domain request.
+For example, if the domain 'example.com' is in the list, then 'foo.bar.example.com'
+will never be considered for a new unique domain request.
+''',
+        'versionadded': '5.1.0'
+    },
+    {
+        'name' : 'unique_response_ignore_list_file',
+        'section' : 'nod',
+        'type' : LType.String,
+        'default' : '',
+        'help' : 'File with list of domains (and implicitly all subdomains) which will never be considered for UDR',
+        'doc' : '''
+Path to a file with a list of domains. File should have one domain per line,
+with no extra characters or comments.
+See :ref:`setting-unique-response-ignore-list`.
+''',
+        'versionadded': '5.1.0'
+    },
     {
         'name' : 'use_incoming_edns_subnet',
         'section' : 'incoming',