Merge pull request #2555 from indrajitr/sagitta-ddclient-backports

ddclient: T5573,T5574,T5612,T5708: Backport ddclient related changes

1 files changed, 15 insertions, 18 deletions

diff --git a/data/templates/dns-dynamic/ddclient.conf.j2 b/data/templates/dns-dynamic/ddclient.conf.j2
index 3446a9d1b..356b8d0d0 100644
--- a/data/templates/dns-dynamic/ddclient.conf.j2
+++ b/data/templates/dns-dynamic/ddclient.conf.j2
@@ -13,61 +13,58 @@ web-skip{{ ipv }}='{{ web_options.skip }}', \
 if{{ ipv }}={{ address }}, \
 {%     endif %}
 {% endfor %}
-{# Other service options #}
-{% for k,v in kwargs.items() %}
-{%     if v is vyos_defined %}
-{{ k }}={{ v }}{{ ',' if not loop.last }} \
-{%     endif %}
+{# 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 }} \
 {% endfor %}
 {# Actual hostname for the service #}
 {{ host }}
 {% endmacro %}
 ### Autogenerated by dns_dynamic.py ###
-daemon={{ timeout }}
+daemon={{ interval }}
 syslog=yes
 ssl=yes
 pid={{ config_file | replace('.conf', '.pid') }}
 cache={{ config_file | replace('.conf', '.cache') }}
-{# Explicitly override global options for reliability #}
-web=googledomains {# ddclient default ('dyndns') doesn't support ssl and results in process lockup #}
-use=no            {# ddclient default ('ip') results in confusing warning message in log #}
+{# 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=disabled
 
 {% if address is vyos_defined %}
 {%     for address, service_cfg in address.items() %}
 {%         if service_cfg.rfc2136 is vyos_defined %}
 {%             for name, config in service_cfg.rfc2136.items() %}
 {%                 if config.description is vyos_defined %}
-# {{ config.description }}
 
+# {{ config.description }}
 {%                 endif %}
 {%                 for host in config.host_name if config.host_name is vyos_defined %}
+
 # RFC2136 dynamic DNS configuration for {{ name }}: [{{ config.zone }}, {{ host }}]
 {# Don't append 'new-style' compliant suffix ('usev4', 'usev6', 'ifv4', 'ifv6' etc.)
    to the properties since 'nsupdate' doesn't support that yet. #}
 {{ render_config(host, address, service_cfg.web_options,
                  protocol='nsupdate', server=config.server, zone=config.zone,
                  password=config.key, ttl=config.ttl) }}
-
 {%                 endfor %}
 {%             endfor %}
 {%         endif %}
 {%         if service_cfg.service is vyos_defined %}
 {%             for name, config in service_cfg.service.items() %}
 {%                 if config.description is vyos_defined %}
-# {{ config.description }}
 
+# {{ config.description }}
 {%                 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:]] %}
+
 # 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) }}
-
+                 login=config.username, password=config.password, ttl=config.ttl,
+                 min_interval=config.wait_time, max_interval=config.expiry_time) }}
 {%                 endfor %}
 {%             endfor %}
 {%         endif %}