diff options
| author | Cheeze-It <16260577+Cheeze-It@users.noreply.github.com> | 2023-04-04 07:41:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-04 07:41:59 -0700 |
| commit | 4d5bc82590533c2f1d65334636fd8427c2a1bf6b (patch) | |
| tree | 1a5479aec55199ac195bd4c6761d7e693cdbfb8a /data/templates/chrony | |
| parent | d6ef0c54ad8c8f9f2c5f1811781dba6111201fe4 (diff) | |
| parent | 94b65bb3936b607a6bc85fe23176ff855c722519 (diff) | |
| download | vyos-1x-4d5bc82590533c2f1d65334636fd8427c2a1bf6b.tar.gz vyos-1x-4d5bc82590533c2f1d65334636fd8427c2a1bf6b.zip | |
Merge branch 'vyos:current' into current
Diffstat (limited to 'data/templates/chrony')
| -rw-r--r-- | data/templates/chrony/chrony.conf.j2 | 3 | ||||
| -rw-r--r-- | data/templates/chrony/override.conf.j2 | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/data/templates/chrony/chrony.conf.j2 b/data/templates/chrony/chrony.conf.j2 index 711bbbec7..7a36fe69d 100644 --- a/data/templates/chrony/chrony.conf.j2 +++ b/data/templates/chrony/chrony.conf.j2 @@ -17,6 +17,7 @@ clientloglimit 1048576 driftfile /run/chrony/drift dumpdir /run/chrony +ntsdumpdir /run/chrony pidfile {{ config_file | replace('.conf', '.pid') }} # Determine when will the next leap second occur and what is the current offset @@ -31,7 +32,7 @@ user {{ user }} {% if config.pool is vyos_defined %} {% set association = 'pool' %} {% endif %} -{{ association }} {{ server | replace('_', '-') }} iburst {{ 'noselect' if config.noselect is vyos_defined }} {{ 'prefer' if config.prefer is vyos_defined }} +{{ association }} {{ server | replace('_', '-') }} iburst {{ 'nts' if config.nts is vyos_defined }} {{ 'noselect' if config.noselect is vyos_defined }} {{ 'prefer' if config.prefer is vyos_defined }} {% endfor %} {% endif %} diff --git a/data/templates/chrony/override.conf.j2 b/data/templates/chrony/override.conf.j2 index 0ab8f0824..b8935ae76 100644 --- a/data/templates/chrony/override.conf.j2 +++ b/data/templates/chrony/override.conf.j2 @@ -5,10 +5,9 @@ ConditionPathExists={{ config_file }} After=vyos-router.service [Service] -User=root EnvironmentFile= ExecStart= -ExecStart={{ vrf_command }}/usr/sbin/chronyd -F 1 -f {{ config_file }} +ExecStart=!{{ vrf_command }}/usr/sbin/chronyd -F 1 -f {{ config_file }} PIDFile= PIDFile={{ config_file | replace('.conf', '.pid') }} Restart=always |