diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-02-02 09:39:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-02 09:39:34 +0100 |
| commit | 5a9a4d5d34ac04d498e62e2537f3618d88ba08f3 (patch) | |
| tree | be7b62abdbb0784e95af80b11d72f878f4d06744 /interface-definitions | |
| parent | b5a907135ef1943b4dbf8d195cae38cfff360d65 (diff) | |
| parent | d9ed904b72fdf6641b0f7d5316207a99ef90a711 (diff) | |
| download | vyos-1x-5a9a4d5d34ac04d498e62e2537f3618d88ba08f3.tar.gz vyos-1x-5a9a4d5d34ac04d498e62e2537f3618d88ba08f3.zip | |
Merge pull request #2926 from indrajitr/sagitta-ddclient-T5966
ddclient: T5966: Adjust dynamic dns config address subpath (manual backport #2860)
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/include/version/dns-dynamic-version.xml.i | 2 | ||||
| -rw-r--r-- | interface-definitions/service_dns_dynamic.xml.in | 47 |
2 files changed, 18 insertions, 31 deletions
diff --git a/interface-definitions/include/version/dns-dynamic-version.xml.i b/interface-definitions/include/version/dns-dynamic-version.xml.i index 773a6ab51..346385ccb 100644 --- a/interface-definitions/include/version/dns-dynamic-version.xml.i +++ b/interface-definitions/include/version/dns-dynamic-version.xml.i @@ -1,3 +1,3 @@ <!-- include start from include/version/dns-dynamic-version.xml.i --> -<syntaxVersion component='dns-dynamic' version='3'></syntaxVersion> +<syntaxVersion component='dns-dynamic' version='4'></syntaxVersion> <!-- include end --> diff --git a/interface-definitions/service_dns_dynamic.xml.in b/interface-definitions/service_dns_dynamic.xml.in index d1b0e90bb..75e5520b7 100644 --- a/interface-definitions/service_dns_dynamic.xml.in +++ b/interface-definitions/service_dns_dynamic.xml.in @@ -38,42 +38,29 @@ </constraint> </properties> </leafNode> - <leafNode name="address"> + <node name="address"> <properties> <help>Obtain IP address to send Dynamic DNS update for</help> - <valueHelp> - <format>txt</format> - <description>Use interface to obtain the IP address</description> - </valueHelp> - <valueHelp> - <format>web</format> - <description>Use HTTP(S) web request to obtain the IP address</description> - </valueHelp> - <completionHelp> - <script>${vyos_completion_dir}/list_interfaces</script> - <list>web</list> - </completionHelp> - <constraint> - #include <include/constraint/interface-name.xml.i> - <regex>web</regex> - </constraint> - </properties> - </leafNode> - <node name="web-options"> - <properties> - <help>Options when using HTTP(S) web request to obtain the IP address</help> </properties> <children> - #include <include/url-http-https.xml.i> - <leafNode name="skip"> + #include <include/generic-interface.xml.i> + <node name="web"> <properties> - <help>Pattern to skip from the HTTP(S) respose</help> - <valueHelp> - <format>txt</format> - <description>Pattern to skip from the HTTP(S) respose to extract the external IP address</description> - </valueHelp> + <help>HTTP(S) web request to use</help> </properties> - </leafNode> + <children> + #include <include/url-http-https.xml.i> + <leafNode name="skip"> + <properties> + <help>Pattern to skip from the HTTP(S) respose</help> + <valueHelp> + <format>txt</format> + <description>Pattern to skip from the HTTP(S) respose to extract the external IP address</description> + </valueHelp> + </properties> + </leafNode> + </children> + </node> </children> </node> <leafNode name="ip-version"> |