2 files changed, 51 insertions, 49 deletions
diff --git a/data/templates/dynamic-dns/ddclient.conf.j2 b/data/templates/dynamic-dns/ddclient.conf.j2
new file mode 100644
index 000000000..3c2d17cbb
--- /dev/null
+++ b/data/templates/dynamic-dns/ddclient.conf.j2
@@ -0,0 +1,51 @@
+### Autogenerated by dynamic_dns.py ###
+daemon=1m
+syslog=yes
+ssl=yes
+
+{% if interface is vyos_defined %}
+{%     for iface, iface_config in interface.items() %}
+# ddclient configuration for interface "{{ iface }}"
+{%         if iface_config.use_web is vyos_defined %}
+{%             set web_skip = ", web-skip='" ~ iface_config.use_web.skip ~ "'" if iface_config.use_web.skip is vyos_defined else '' %}
+use=web, web='{{ iface_config.use_web.url }}'{{ web_skip }}
+{%         else %}
+{{ 'usev6=if' if iface_config.ipv6_enable is vyos_defined else 'use=if' }}, if={{ iface }}
+{%         endif %}
+
+{%         if iface_config.rfc2136 is vyos_defined %}
+{%             for rfc2136, config in iface_config.rfc2136.items() %}
+{%                 for dns_record in config.record if config.record is vyos_defined %}
+# RFC2136 dynamic DNS configuration for {{ rfc2136 }}, {{ config.zone }}, {{ dns_record }}
+server={{ config.server }}
+protocol=nsupdate
+password={{ config.key }}
+ttl={{ config.ttl }}
+zone={{ config.zone }}
+{{ dns_record }}
+
+{%                 endfor %}
+{%             endfor %}
+{%         endif %}
+
+{%         if iface_config.service is vyos_defined %}
+{%             for service, config in iface_config.service.items() %}
+{%                 for dns_record in config.host_name %}
+# DynDNS provider configuration for {{ service }}, {{ dns_record }}
+protocol={{ config.protocol }},
+max-interval=28d,
+login={{ config.login }},
+password='{{ config.password }}',
+{%                     if config.server is vyos_defined %}
+server={{ config.server }},
+{%                     endif %}
+{%                     if config.zone is vyos_defined %}
+zone={{ config.zone }},
+{%                     endif %}
+{{ dns_record }}
+
+{%                 endfor %}
+{%             endfor %}
+{%         endif %}
+{%     endfor %}
+{% endif %}
diff --git a/data/templates/dynamic-dns/ddclient.conf.tmpl b/data/templates/dynamic-dns/ddclient.conf.tmpl
deleted file mode 100644
index 517e4bad4..000000000
--- a/data/templates/dynamic-dns/ddclient.conf.tmpl
+++ /dev/null
@@ -1,49 +0,0 @@
-### Autogenerated by dynamic_dns.py ###
-daemon=1m
-syslog=yes
-ssl=yes
-
-{% for iface in interface %}
-# ddclient configuration for interface "{{ iface }}"
-{%   if interface[iface].use_web is defined and interface[iface].use_web is not none %}
-{%     set web_skip = ", web-skip='" + interface[iface].use_web.skip + "'" if interface[iface].use_web.skip is defined else '' %}
-use=web, web='{{ interface[iface].use_web.url }}'{{ web_skip }}
-{%   else %}
-{{ 'usev6=if' if interface[iface].ipv6_enable is defined else 'use=if' }}, if={{ iface }}
-{%   endif %}
-
-{%   if interface[iface].rfc2136 is defined and interface[iface].rfc2136 is not none %}
-{%     for rfc2136, config in interface[iface].rfc2136.items() %}
-{%       for dns_record in config.record if config.record is defined %}
-# RFC2136 dynamic DNS configuration for {{ rfc2136 }}, {{ config.zone }}, {{ dns_record }}
-server={{ config.server }}
-protocol=nsupdate
-password={{ config.key }}
-ttl={{ config.ttl }}
-zone={{ config.zone }}
-{{ dns_record }}
-
-{%       endfor %}
-{%     endfor %}
-{%   endif %}
-
-{%   if interface[iface].service is defined and interface[iface].service is not none %}
-{%     for service, config in interface[iface].service.items() %}
-{%       for dns_record in config.host_name %}
-# DynDNS provider configuration for {{ service }}, {{ dns_record }}
-protocol={{ config.protocol }},
-max-interval=28d,
-login={{ config.login }},
-password='{{ config.password }}',
-{%         if config.server %}
-server={{ config.server }},
-{%         endif %}
-{%         if config.zone %}
-zone={{ config.zone }},
-{%         endif %}
-{{ dns_record }}
-
-{%       endfor %}
-{%     endfor %}
-{%   endif %}
-{% endfor %}