From 3f657383cdd96b984c594bb8323a714d7a692f11 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 1 May 2022 19:18:53 +0200
Subject: login: T4353: fix Jinja2 linting errors

---
 data/templates/login/authorized_keys.j2        |  9 +++++++
 data/templates/login/authorized_keys.tmpl      |  9 -------
 data/templates/login/pam_radius_auth.conf.j2   | 36 ++++++++++++++++++++++++++
 data/templates/login/pam_radius_auth.conf.tmpl | 36 --------------------------
 4 files changed, 45 insertions(+), 45 deletions(-)
 create mode 100644 data/templates/login/authorized_keys.j2
 delete mode 100644 data/templates/login/authorized_keys.tmpl
 create mode 100644 data/templates/login/pam_radius_auth.conf.j2
 delete mode 100644 data/templates/login/pam_radius_auth.conf.tmpl

(limited to 'data')

diff --git a/data/templates/login/authorized_keys.j2 b/data/templates/login/authorized_keys.j2
new file mode 100644
index 000000000..aabca47cf
--- /dev/null
+++ b/data/templates/login/authorized_keys.j2
@@ -0,0 +1,9 @@
+### Automatically generated by system-login.py ###
+
+{% if authentication.public_keys is vyos_defined %}
+{%     for key, key_options in authentication.public_keys.items() %}
+{# The whitespace after options is wisely chosen #}
+{{ key_options.options ~ ' ' if key_options.options is vyos_defined }}{{ key_options.type }} {{ key_options.key }} {{ key }}
+{%     endfor %}
+{% endif %}
+
diff --git a/data/templates/login/authorized_keys.tmpl b/data/templates/login/authorized_keys.tmpl
deleted file mode 100644
index 9402c8719..000000000
--- a/data/templates/login/authorized_keys.tmpl
+++ /dev/null
@@ -1,9 +0,0 @@
-### Automatically generated by system-login.py ###
-
-{% if authentication.public_keys is vyos_defined %}
-{%   for key, key_options in authentication.public_keys.items() %}
-{# The whitespace after options is wisely chosen #}
-{{ key_options.options ~ ' ' if key_options.options is vyos_defined }}{{ key_options.type }} {{ key_options.key }} {{ key }}
-{%   endfor %}
-{% endif %}
-
diff --git a/data/templates/login/pam_radius_auth.conf.j2 b/data/templates/login/pam_radius_auth.conf.j2
new file mode 100644
index 000000000..1105b60e5
--- /dev/null
+++ b/data/templates/login/pam_radius_auth.conf.j2
@@ -0,0 +1,36 @@
+# Automatically generated by system-login.py
+# RADIUS configuration file
+
+{% if radius is vyos_defined %}
+{#     RADIUS IPv6 source address must be specified in [] notation #}
+{%     set source_address = namespace()  %}
+{%     if radius.source_address is vyos_defined %}
+{%         for address in radius.source_address %}
+{%             if address | is_ipv4 %}
+{%                 set source_address.ipv4 = address %}
+{%             elif address | is_ipv6 %}
+{%                 set source_address.ipv6 = "[" + address + "]" %}
+{%             endif %}
+{%         endfor %}
+{%     endif %}
+{%     if radius.server is vyos_defined %}
+# server[:port]        shared_secret             timeout    source_ip
+{# .items() returns a tuple of two elements: key and value. 1 relates to the 2nd element i.e. the value and .priority relates to the key from the internal dict #}
+{%         for server, options in radius.server.items() | sort(attribute='1.priority') if not options.disabled %}
+{#         RADIUS IPv6 servers must be specified in [] notation #}
+{%             if server | is_ipv4 %}
+{{ server }}:{{ options.port }} {{ "%-25s" | format(options.key) }} {{ "%-10s" | format(options.timeout) }} {{ source_address.ipv4 if source_address.ipv4 is vyos_defined }}
+{%             else %}
+[{{ server }}]:{{ options.port }} {{ "%-25s" | format(options.key) }} {{ "%-10s" | format(options.timeout) }} {{ source_address.ipv6 if source_address.ipv6 is vyos_defined }}
+{%             endif %}
+{%         endfor %}
+{%     endif %}
+
+priv-lvl 15
+mapped_priv_user radius_priv_user
+
+{%     if radius.vrf is vyos_defined %}
+vrf-name {{ radius.vrf }}
+{%     endif %}
+{% endif %}
+
diff --git a/data/templates/login/pam_radius_auth.conf.tmpl b/data/templates/login/pam_radius_auth.conf.tmpl
deleted file mode 100644
index 4e34ade41..000000000
--- a/data/templates/login/pam_radius_auth.conf.tmpl
+++ /dev/null
@@ -1,36 +0,0 @@
-# Automatically generated by system-login.py
-# RADIUS configuration file
-
-{% if radius is vyos_defined %}
-{#   RADIUS IPv6 source address must be specified in [] notation #}
-{%   set source_address = namespace()  %}
-{%   if radius.source_address is vyos_defined %}
-{%     for address in radius.source_address %}
-{%       if address | is_ipv4 %}
-{%         set source_address.ipv4 = address %}
-{%       elif address | is_ipv6 %}
-{%         set source_address.ipv6 = "[" + address + "]" %}
-{%       endif %}
-{%     endfor %}
-{%   endif %}
-{% if radius.server is vyos_defined %}
-# server[:port]        shared_secret             timeout    source_ip
-{# .items() returns a tuple of two elements: key and value. 1 relates to the 2nd element i.e. the value and .priority relates to the key from the internal dict #}
-{%   for server, options in radius.server.items() | sort(attribute='1.priority') if not options.disabled %}
-{#   RADIUS IPv6 servers must be specified in [] notation #}
-{%     if server | is_ipv4 %}
-{{ server }}:{{ options.port }} {{ "%-25s" | format(options.key) }} {{ "%-10s" | format(options.timeout) }} {{ source_address.ipv4 if source_address.ipv4 is vyos_defined }}
-{%     else %}
-[{{ server }}]:{{ options.port }} {{ "%-25s" | format(options.key) }} {{ "%-10s" | format(options.timeout) }} {{ source_address.ipv6 if source_address.ipv6 is vyos_defined }}
-{%     endif %}
-{%   endfor %}
-{% endif %}
-
-priv-lvl 15
-mapped_priv_user radius_priv_user
-
-{%   if radius.vrf is vyos_defined %}
-vrf-name {{ radius.vrf }}
-{%   endif %}
-{% endif %}
-
-- 
cgit v1.2.3