summaryrefslogtreecommitdiff
path: root/data/templates/dns-dynamic
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2023-06-10 07:45:36 +0200
committerGitHub <noreply@github.com>2023-06-10 07:45:36 +0200
commit0b99a4cba1279b5a27d2fa013004501f89b3edce (patch)
treed2db029afbd2b3cbaa656414f66d41da5f2bbd6a /data/templates/dns-dynamic
parenta7ee793b4e1f038e9b0f0774f10c407fc36ec164 (diff)
parent2e79de15fc3852a67d2fa4ae557ecd091a3ad780 (diff)
downloadvyos-1x-0b99a4cba1279b5a27d2fa013004501f89b3edce.tar.gz
vyos-1x-0b99a4cba1279b5a27d2fa013004501f89b3edce.zip
Merge pull request #2035 from indrajitr/ddclient-improvement-round-4
dns: T5144: Improve dynamic dns monitor and log and miscellaneous updates
Diffstat (limited to 'data/templates/dns-dynamic')
-rw-r--r--data/templates/dns-dynamic/ddclient.conf.j29
-rw-r--r--data/templates/dns-dynamic/override.conf.j21
2 files changed, 6 insertions, 4 deletions
diff --git a/data/templates/dns-dynamic/ddclient.conf.j2 b/data/templates/dns-dynamic/ddclient.conf.j2
index a19b79c00..4da7153c7 100644
--- a/data/templates/dns-dynamic/ddclient.conf.j2
+++ b/data/templates/dns-dynamic/ddclient.conf.j2
@@ -28,6 +28,9 @@ 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 #}
{% if address is vyos_defined %}
{% for address, service_cfg in address.items() %}
@@ -58,9 +61,9 @@ cache={{ config_file | replace('.conf', '.cache') }}
{% set ip_suffixes = ['v4', 'v6'] if config.ip_version == 'both'
else (['v6'] if config.ip_version == 'ipv6' else ['']) %}
# Web service dynamic DNS configuration for {{ name }}: [{{ config.protocol }}, {{ host }}]
-{# For ipv4 only 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. #}
+{# 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) }}
diff --git a/data/templates/dns-dynamic/override.conf.j2 b/data/templates/dns-dynamic/override.conf.j2
index 8a9dfcd70..6ca1b8a45 100644
--- a/data/templates/dns-dynamic/override.conf.j2
+++ b/data/templates/dns-dynamic/override.conf.j2
@@ -4,7 +4,6 @@ ConditionPathExists={{ config_file }}
After=vyos-router.service
[Service]
-PIDFile=
PIDFile={{ config_file | replace('.conf', '.pid') }}
EnvironmentFile=
ExecStart=