summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIndrajit Raychaudhuri <irc@indrajit.com>2023-09-12 20:09:16 -0500
committerIndrajit Raychaudhuri <irc@indrajit.com>2023-11-30 21:42:23 -0600
commitac62ced0a1d1737fd8680f45361298a1720c5903 (patch)
tree72256e245fcd37d3b4170187cdfaa4190f68f027
parent652e235894aeae46765ea9fbbe2208578aaa7a8c (diff)
downloadvyos-1x-ac62ced0a1d1737fd8680f45361298a1720c5903.tar.gz
vyos-1x-ac62ced0a1d1737fd8680f45361298a1720c5903.zip
ddclient: T5573: Update config generation aligning with caching fixes
Now that the caching fixes are in place, we can update the config to remove legacy treatment of ipv4 related properties.
-rw-r--r--data/templates/dns-dynamic/ddclient.conf.j25
1 files changed, 1 insertions, 4 deletions
diff --git a/data/templates/dns-dynamic/ddclient.conf.j2 b/data/templates/dns-dynamic/ddclient.conf.j2
index 3446a9d1b..421daf1df 100644
--- a/data/templates/dns-dynamic/ddclient.conf.j2
+++ b/data/templates/dns-dynamic/ddclient.conf.j2
@@ -59,11 +59,8 @@ use=no {# ddclient default ('ip') results in confusing warning messag
{% endif %}
{% for host in config.host_name if config.host_name is vyos_defined %}
{% set ip_suffixes = ['v4', 'v6'] if config.ip_version == 'both'
- else (['v6'] if config.ip_version == 'ipv6' else ['']) %}
+ else [config.ip_version[2:]] %} {# 'ipvX' -> 'vX' #}
# Web service dynamic DNS configuration for {{ name }}: [{{ config.protocol }}, {{ host }}]
-{# For ipv4 only setup or legacy ipv6 setup, don't append 'new-style' compliant suffix
- ('usev4', 'ifv4', 'webv4' etc.) to the properties and instead live through the
- deprecation warnings for better compatibility with most ddclient protocols. #}
{{ render_config(host, address, service_cfg.web_options, ip_suffixes,
protocol=config.protocol, server=config.server, zone=config.zone,
login=config.username, password=config.password) }}