diff options
| -rw-r--r-- | data/templates/login/authorized_keys.tmpl | 4 | ||||
| -rw-r--r-- | data/templates/login/pam_radius_auth.conf.tmpl | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/data/templates/login/authorized_keys.tmpl b/data/templates/login/authorized_keys.tmpl index 639a80e1d..9402c8719 100644 --- a/data/templates/login/authorized_keys.tmpl +++ b/data/templates/login/authorized_keys.tmpl @@ -1,9 +1,9 @@ ### Automatically generated by system-login.py ### -{% if authentication is defined and authentication.public_keys is defined and authentication.public_keys is not none %} +{% 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 defined }}{{ key_options.type }} {{ key_options.key }} {{ key }} +{{ 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.tmpl b/data/templates/login/pam_radius_auth.conf.tmpl index fad8e7dcb..4e34ade41 100644 --- a/data/templates/login/pam_radius_auth.conf.tmpl +++ b/data/templates/login/pam_radius_auth.conf.tmpl @@ -1,10 +1,10 @@ # Automatically generated by system-login.py # RADIUS configuration file -{% if radius is defined and radius is not none %} +{% if radius is vyos_defined %} {# RADIUS IPv6 source address must be specified in [] notation #} {% set source_address = namespace() %} -{% if radius.source_address is defined and radius.source_address is not none %} +{% if radius.source_address is vyos_defined %} {% for address in radius.source_address %} {% if address | is_ipv4 %} {% set source_address.ipv4 = address %} @@ -13,15 +13,15 @@ {% endif %} {% endfor %} {% endif %} -{% if radius.server is defined and radius.server is not none %} +{% 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 defined }} +{{ 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 defined }} +[{{ server }}]:{{ options.port }} {{ "%-25s" | format(options.key) }} {{ "%-10s" | format(options.timeout) }} {{ source_address.ipv6 if source_address.ipv6 is vyos_defined }} {% endif %} {% endfor %} {% endif %} @@ -29,7 +29,7 @@ priv-lvl 15 mapped_priv_user radius_priv_user -{% if radius.vrf is defined and radius.vrf is not none %} +{% if radius.vrf is vyos_defined %} vrf-name {{ radius.vrf }} {% endif %} {% endif %} |