From 2f278d4dd00caf2b30b3908545d982062a6eb68d Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Mon, 8 May 2023 08:32:35 +0200
Subject: dns: T4144: additional improvements to dynamic DNS XML definitions

* Re-use XML building blocks when poossible
* Use XML constraints when possible (password)
* Capitalize protocols (HTTP) in <help> strings
---
 interface-definitions/dns-dynamic.xml.in | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/dns-dynamic.xml.in b/interface-definitions/dns-dynamic.xml.in
index 3e77e2540..48c101d73 100644
--- a/interface-definitions/dns-dynamic.xml.in
+++ b/interface-definitions/dns-dynamic.xml.in
@@ -135,19 +135,19 @@
                       <leafNode name="host-name">
                         <properties>
                           <help>Hostname to register with Dynamic DNS service</help>
+                          <constraint>
+                            #include <include/constraint/host-name.xml.i>
+                          </constraint>
+                          <constraintErrorMessage>Host-name must be alphanumeric and can contain hyphens</constraintErrorMessage>
                           <multi/>
                         </properties>
                       </leafNode>
                       <leafNode name="login">
                         <properties>
-                          <help>Login for Dynamic DNS service (not used by all protocols, or referred as api-token in some cases)</help>
-                        </properties>
-                      </leafNode>
-                      <leafNode name="password">
-                        <properties>
-                          <help>Password for Dynamic DNS service (referred as api-token, global-token or api-secret in some cases)</help>
+                          <help>Login/Username for Dynamic DNS service</help>
                         </properties>
                       </leafNode>
+                      #include <include/generic-password.xml.i>
                       <leafNode name="protocol">
                         <properties>
                           <help>ddclient protocol used for Dynamic DNS service</help>
@@ -163,25 +163,29 @@
                       <leafNode name="zone">
                         <properties>
                           <help>DNS zone to update (not used by all protocols)</help>
+                          <valueHelp>
+                            <format>txt</format>
+                            <description>Name of DNS zone</description>
+                          </valueHelp>
                         </properties>
                       </leafNode>
                     </children>
                   </tagNode>
                   <node name="use-web">
                     <properties>
-                      <help>Use http(s) web request to obtain the external IP address instead of the IP address associated with the interface</help>
+                      <help>Use HTTP(S) web request to obtain external IP address instead of the IP address associated with the interface</help>
                     </properties>
                     <children>
                       <leafNode name="skip">
                         <properties>
-                          <help>Text pattern to skip from the respose of the given URL to extract the external IP address</help>
-                        </properties>
-                      </leafNode>
-                      <leafNode name="url">
-                        <properties>
-                          <help>Custom URL to obtain the current external IP address over http(s) web request, overriding ddclient default</help>
+                          <help>Pattern to skip from the respose</help>
+                          <valueHelp>
+                            <format>txt</format>
+                            <description>Pattern to skip from the respose of the given URL to extract the external IP address</description>
+                          </valueHelp>
                         </properties>
                       </leafNode>
+                      #include <include/url.xml.i>
                     </children>
                   </node>
                   <leafNode name="ipv6-enable">
-- 
cgit v1.2.3