summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2018-11-11 20:23:04 +0100
committerChristian Poessinger <christian@poessinger.com>2018-11-11 20:26:15 +0100
commitbeb98d35e3592b362845606fbe8a6cec0dbb1886 (patch)
tree9e9c8f892c4d3d6e181ce9e8cf0f4e3857251fcc
parenteeb4552c3407f7e918129b57e611dd45487d3e6e (diff)
downloadvyos-1x-beb98d35e3592b362845606fbe8a6cec0dbb1886.tar.gz
vyos-1x-beb98d35e3592b362845606fbe8a6cec0dbb1886.zip
T998: "service dns dynamic" does now honor the "use-web" statement
This bug was present since the old Vyatta days as the use-web statement was only put into action when also "use-web skip" was defined. The service https://ipinfo.io/ip does not place any crap in front of the IP address so the skip statement was not used and made no sense. (cherry picked from commit 718d9a123c2ba72b87d7f6e48a5e6d83fa86d494)
-rwxr-xr-xsrc/conf_mode/dynamic_dns.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/conf_mode/dynamic_dns.py b/src/conf_mode/dynamic_dns.py
index 60efcaae2..afebc5d0e 100755
--- a/src/conf_mode/dynamic_dns.py
+++ b/src/conf_mode/dynamic_dns.py
@@ -38,8 +38,8 @@ cache=/var/cache/ddclient/ddclient.cache
#
# ddclient configuration for interface "{{ interface.interface }}":
#
-{% if interface.web_url and interface.web_skip -%}
-use=web, web={{ interface.web_url}}, web-skip={{ interface.web_skip }}
+{% if interface.web_url -%}
+use=web, web={{ interface.web_url}} {%- if interface.web_skip %}, web-skip={{ interface.web_skip }}{% endif %}
{% else -%}
use=if, if={{ interface.interface }}
{% endif -%}