diff options
author | Christian Poessinger <christian@poessinger.com> | 2020-07-03 13:31:03 +0200 |
---|---|---|
committer | Christian Poessinger <christian@poessinger.com> | 2020-07-03 13:31:03 +0200 |
commit | 5ceec317f24ed39db4cf8921e8078ab119059df9 (patch) | |
tree | 0924985fbe34fceae11374cba9bf402d7feed91b /data/templates/ntp | |
parent | 5d9a89a522079eeb3d86cafc480b37f0616e4658 (diff) | |
download | vyos-1x-5ceec317f24ed39db4cf8921e8078ab119059df9.tar.gz vyos-1x-5ceec317f24ed39db4cf8921e8078ab119059df9.zip |
ntp: T2676: mive to get_config_dict()
Diffstat (limited to 'data/templates/ntp')
-rw-r--r-- | data/templates/ntp/ntp.conf.tmpl | 41 |
1 files changed, 25 insertions, 16 deletions
diff --git a/data/templates/ntp/ntp.conf.tmpl b/data/templates/ntp/ntp.conf.tmpl index 52042d218..1c51929fd 100644 --- a/data/templates/ntp/ntp.conf.tmpl +++ b/data/templates/ntp/ntp.conf.tmpl @@ -13,26 +13,35 @@ restrict -6 ::1 # # Configurable section # - -{% if servers -%} -{% for s in servers -%} -# Server configuration for: {{ s.name }} -server {{ s.name }} iburst {{ s.options | join(" ") }} -{% endfor -%} +{% if server %} +{% for srv in server %} +{% set options = '' %} +{% set options = options + 'noselect ' if server[srv].noselect is defined else '' %} +{% set options = options + 'preempt ' if server[srv].preempt is defined else '' %} +{% set options = options + 'prefer ' if server[srv].prefer is defined else '' %} +server {{ srv }} iburst {{ options }} +{% endfor %} {% endif %} -{% if allowed_networks -%} -{% for n in allowed_networks -%} -# Client configuration for network: {{ n.network }} -restrict {{ n.address }} mask {{ n.netmask }} nomodify notrap nopeer - -{% endfor -%} +{% if allow_clients is defined and allow_clients.address is defined %} +# Allowed clients configuration +{% if allow_clients.address is string %} +restrict {{ allow_clients.address|address_from_cidr }} mask {{ allow_clients.address|netmask_from_cidr }} nomodify notrap nopeer +{% else %} +{% for address in allow_clients.address %} +restrict {{ address|address_from_cidr }} mask {{ address|netmask_from_cidr }} nomodify notrap nopeer +{% endfor %} +{% endif %} {% endif %} -{% if listen_address -%} +{% if listen_address %} # NTP should listen on configured addresses only interface ignore wildcard -{% for a in listen_address -%} -interface listen {{ a }} -{% endfor -%} +{% if listen_address is string %} +interface listen {{ listen_address }} +{% else %} +{% for address in listen_address %} +interface listen {{ address }} +{% endfor %} +{% endif %} {% endif %} |