From b0acc3a58f75f01ff19dbc9544e681cfc9d50c8e Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Thu, 14 Apr 2022 21:34:40 +0200
Subject: ntp: T4353: fix Jinja2 linting errors

---
 data/templates/ntp/ntpd.conf.j2       | 42 +++++++++++++++++++++++++++++++++++
 data/templates/ntp/ntpd.conf.tmpl     | 42 -----------------------------------
 data/templates/ntp/override.conf.j2   | 14 ++++++++++++
 data/templates/ntp/override.conf.tmpl | 14 ------------
 src/conf_mode/ntp.py                  |  4 ++--
 5 files changed, 58 insertions(+), 58 deletions(-)
 create mode 100644 data/templates/ntp/ntpd.conf.j2
 delete mode 100644 data/templates/ntp/ntpd.conf.tmpl
 create mode 100644 data/templates/ntp/override.conf.j2
 delete mode 100644 data/templates/ntp/override.conf.tmpl

diff --git a/data/templates/ntp/ntpd.conf.j2 b/data/templates/ntp/ntpd.conf.j2
new file mode 100644
index 000000000..da610051e
--- /dev/null
+++ b/data/templates/ntp/ntpd.conf.j2
@@ -0,0 +1,42 @@
+### Autogenerated by ntp.py ###
+
+#
+# Non-configurable defaults
+#
+driftfile /var/lib/ntp/ntp.drift
+# By default, only allow ntpd to query time sources, ignore any incoming requests
+restrict default noquery nopeer notrap nomodify
+# Allow pool associations
+restrict source nomodify notrap noquery
+# Local users have unrestricted access, allowing reconfiguration via ntpdc
+restrict 127.0.0.1
+restrict -6 ::1
+
+#
+# Configurable section
+#
+{% if server is vyos_defined %}
+{%     for server, config in server.items() %}
+{%         set association = 'server' %}
+{%         if config.pool is vyos_defined %}
+{%             set association = 'pool' %}
+{%         endif %}
+{{ association }} {{ server | replace('_', '-') }} iburst {{ 'noselect' if config.noselect is vyos_defined }} {{ 'preempt' if config.preempt is vyos_defined }} {{ 'prefer' if config.prefer is vyos_defined }}
+{%     endfor %}
+{% endif %}
+
+{% if allow_clients.address is vyos_defined %}
+# Allowed clients configuration
+restrict default ignore
+{%     for address in allow_clients.address %}
+restrict {{ address | address_from_cidr }} mask {{ address | netmask_from_cidr }} nomodify notrap nopeer
+{%     endfor %}
+{% endif %}
+
+{% if listen_address %}
+# NTP should listen on configured addresses only
+interface ignore wildcard
+{%     for address in listen_address %}
+interface listen {{ address }}
+{%     endfor %}
+{% endif %}
diff --git a/data/templates/ntp/ntpd.conf.tmpl b/data/templates/ntp/ntpd.conf.tmpl
deleted file mode 100644
index 3123fdf19..000000000
--- a/data/templates/ntp/ntpd.conf.tmpl
+++ /dev/null
@@ -1,42 +0,0 @@
-### Autogenerated by ntp.py ###
-
-#
-# Non-configurable defaults
-#
-driftfile /var/lib/ntp/ntp.drift
-# By default, only allow ntpd to query time sources, ignore any incoming requests
-restrict default noquery nopeer notrap nomodify
-# Allow pool associations
-restrict source nomodify notrap noquery
-# Local users have unrestricted access, allowing reconfiguration via ntpdc
-restrict 127.0.0.1
-restrict -6 ::1
-
-#
-# Configurable section
-#
-{% if server is vyos_defined %}
-{%   for server, config in server.items() %}
-{%     set association = 'server' %}
-{%     if config.pool is vyos_defined %}
-{%       set association = 'pool' %}
-{%     endif %}
-{{ association }} {{ server | replace('_', '-') }} iburst {{ 'noselect' if config.noselect is vyos_defined }} {{ 'preempt' if config.preempt is vyos_defined }} {{ 'prefer' if config.prefer is vyos_defined }}
-{%   endfor %}
-{% endif %}
-
-{% if allow_clients.address is vyos_defined %}
-# Allowed clients configuration
-restrict default ignore
-{%   for address in allow_clients.address %}
-restrict {{ address|address_from_cidr }} mask {{ address|netmask_from_cidr }} nomodify notrap nopeer
-{%   endfor %}
-{% endif %}
-
-{% if listen_address %}
-# NTP should listen on configured addresses only
-interface ignore wildcard
-{%   for address in listen_address %}
-interface listen {{ address }}
-{%   endfor %}
-{% endif %}
diff --git a/data/templates/ntp/override.conf.j2 b/data/templates/ntp/override.conf.j2
new file mode 100644
index 000000000..6fed9d7d2
--- /dev/null
+++ b/data/templates/ntp/override.conf.j2
@@ -0,0 +1,14 @@
+{% set vrf_command = 'ip vrf exec ' ~ vrf ~ ' ' if vrf is vyos_defined else '' %}
+[Unit]
+StartLimitIntervalSec=0
+ConditionPathExists={{ config_file }}
+After=vyos-router.service
+
+[Service]
+ExecStart=
+ExecStart={{ vrf_command }}/usr/sbin/ntpd -g -p {{ config_file | replace('.conf', '.pid') }} -c {{ config_file }} -u ntp:ntp
+PIDFile=
+PIDFile={{ config_file | replace('.conf', '.pid') }}
+Restart=always
+RestartSec=10
+
diff --git a/data/templates/ntp/override.conf.tmpl b/data/templates/ntp/override.conf.tmpl
deleted file mode 100644
index dbfdc4545..000000000
--- a/data/templates/ntp/override.conf.tmpl
+++ /dev/null
@@ -1,14 +0,0 @@
-{% set vrf_command = 'ip vrf exec ' ~ vrf ~ ' ' if vrf is vyos_defined else '' %}
-[Unit]
-StartLimitIntervalSec=0
-ConditionPathExists={{config_file}}
-After=vyos-router.service
-
-[Service]
-ExecStart=
-ExecStart={{vrf_command}}/usr/sbin/ntpd -g -p {{ config_file | replace('.conf', '.pid') }} -c {{ config_file }} -u ntp:ntp
-PIDFile=
-PIDFile={{config_file | replace('.conf', '.pid') }}
-Restart=always
-RestartSec=10
-
diff --git a/src/conf_mode/ntp.py b/src/conf_mode/ntp.py
index 52070aabc..0d6ec9ace 100755
--- a/src/conf_mode/ntp.py
+++ b/src/conf_mode/ntp.py
@@ -56,8 +56,8 @@ def generate(ntp):
     if not ntp:
         return None
 
-    render(config_file, 'ntp/ntpd.conf.tmpl', ntp)
-    render(systemd_override, 'ntp/override.conf.tmpl', ntp)
+    render(config_file, 'ntp/ntpd.conf.j2', ntp)
+    render(systemd_override, 'ntp/override.conf.j2', ntp)
 
     return None
 
-- 
cgit v1.2.3