Merge pull request #5123 from indrajitr/ddclient-v4

ddclient: T6981: Upgrade ddclient to v4.0.0

1 files changed, 11 insertions, 16 deletions

diff --git a/data/templates/dns-dynamic/ddclient.conf.j2 b/data/templates/dns-dynamic/ddclient.conf.j2
index b209c8c81..ef7432433 100644
--- a/data/templates/dns-dynamic/ddclient.conf.j2
+++ b/data/templates/dns-dynamic/ddclient.conf.j2
@@ -15,17 +15,12 @@ if{{ ipv }}={{ address }}, \
 {% endfor %}
 {# Other service options with special treatment for password #}
 {% for k,v in kwargs.items() if v is vyos_defined %}
-{{ k | replace('_', '-') }}={{ "'%s'" % (v) if k == 'password' else v }}{{ ',' if not loop.last }} \
+{{ k | replace('_', '-') }}={{ "'%s'" % (v) if k in ['password', 'secretapikey'] else v }}{{ ',' if not loop.last }} \
 {% endfor %}
 {# Actual hostname for the service #}
 {{ host }}
 {% endmacro %}
 ### Autogenerated by service_dns_dynamic.py ###
-ssl=yes
-{# ddclient default (web=dyndns) doesn't support ssl and results in process lockup #}
-web=googledomains
-{# ddclient default (use=ip) results in confusing warning message in log #}
-use=no
 
 {% if name is vyos_defined %}
 {%     for service, config in name.items() %}
@@ -34,22 +29,22 @@ use=no
 # {{ config.description }}
 {%         endif %}
 {%         for host in config.host_name if config.host_name is vyos_defined %}
-{#             ip_suffixes can be either of ['v4'], ['v6'], ['v4', 'v6'] for all protocols except 'nsupdate'
-               ip_suffixes must be [''] for nsupdate since it doesn't support usevX/wantipvX yet #}
-{%             set ip_suffixes = ['v4', 'v6'] if config.ip_version == 'both'
-                                 else ([config.ip_version[2:]] if config.protocol != 'nsupdate'
-                                       else ['']) %}
-{%             set password = config.key if config.protocol == 'nsupdate'
-                              else config.password %}
 {%             set address = 'web' if config.address.web is vyos_defined
                               else config.address.interface %}
 {%             set web_options = config.address.web | default({}) %}
+{#             ip_suffixes can be either of ['v4'], ['v6'], ['v4', 'v6'] for all protocols #}
+{%             set ip_suffixes = ['v4', 'v6'] if config.ip_version == 'both'
+                                 else [config.ip_version[2:]] %}
 
 # Web service dynamic DNS configuration for {{ service }}: [{{ config.protocol }}, {{ host }}]
 {{ render_config(host, address, web_options, ip_suffixes,
-                 protocol=config.protocol, server=config.server, zone=config.zone,
-                 login=config.username, password=password, ttl=config.ttl,
-                 min_interval=config.wait_time, max_interval=config.expiry_time) }}
+                 protocol=config.protocol, server=config.server,
+                 zone=config.zone, root_domain=config.root_domain,
+                 login=config.username, apikey=config.apikey,
+                 password=config.password, secretapikey=config.secretapikey,
+                 use_personal_access_token=config.use_personal_access_token,
+                 ttl=config.ttl, min_interval=config.wait_time,
+                 max_interval=config.expiry_time) }}
 {%         endfor %}
 {%     endfor %}
 {% endif %}