summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-08-31 19:57:06 +0200
committerChristian Poessinger <christian@poessinger.com>2020-08-31 19:59:25 +0200
commit9c63731d6683f59ea784c08852ed38e3ac22794b (patch)
treecebb83f73174ca647fdb59bccb3a584d3b3670e5 /data
parent621fcb078abb53888e995a007fb9ea31e95e34ab (diff)
downloadvyos-1x-9c63731d6683f59ea784c08852ed38e3ac22794b.tar.gz
vyos-1x-9c63731d6683f59ea784c08852ed38e3ac22794b.zip
T2636: remove workarounds for get_config_dict()
Now that b40c52682a256 ("config: T2636: get_config_dict() returns a list on multi node by default") is implemented the workarounds can be removed.
Diffstat (limited to 'data')
-rw-r--r--data/templates/ntp/ntp.conf.tmpl16
-rw-r--r--data/templates/ssh/sshd_config.tmpl16
-rw-r--r--data/templates/wifi/hostapd.conf.tmpl12
3 files changed, 8 insertions, 36 deletions
diff --git a/data/templates/ntp/ntp.conf.tmpl b/data/templates/ntp/ntp.conf.tmpl
index 6ef0c0f2c..df8157a41 100644
--- a/data/templates/ntp/ntp.conf.tmpl
+++ b/data/templates/ntp/ntp.conf.tmpl
@@ -25,23 +25,15 @@ server {{ srv | replace('_', '-') }} iburst {{ options }}
{% 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 %}
+{% for address in allow_clients.address %}
restrict {{ address|address_from_cidr }} mask {{ address|netmask_from_cidr }} nomodify notrap nopeer
-{% endfor %}
-{% endif %}
+{% endfor %}
{% endif %}
{% if listen_address %}
# NTP should listen on configured addresses only
interface ignore wildcard
-{% if listen_address is string %}
-interface listen {{ listen_address }}
-{% else %}
-{% for address in listen_address %}
+{% for address in listen_address %}
interface listen {{ address }}
-{% endfor %}
-{% endif %}
+{% endfor %}
{% endif %}
diff --git a/data/templates/ssh/sshd_config.tmpl b/data/templates/ssh/sshd_config.tmpl
index 4fde24255..52d537aca 100644
--- a/data/templates/ssh/sshd_config.tmpl
+++ b/data/templates/ssh/sshd_config.tmpl
@@ -37,13 +37,9 @@ PermitRootLogin no
UseDNS {{ "no" if disable_host_validation is defined else "yes" }}
# Specifies the port number that sshd(8) listens on
-{% if port is string %}
-Port {{ port }}
-{% else %}
-{% for value in port %}
+{% for value in port %}
Port {{ value }}
-{% endfor %}
-{% endif %}
+{% endfor %}
# Gives the verbosity level that is used when logging messages from sshd
LogLevel {{ loglevel | upper }}
@@ -53,13 +49,9 @@ PasswordAuthentication {{ "no" if disable_password_authentication is defined els
{% if listen_address %}
# Specifies the local addresses sshd should listen on
-{% if listen_address is string %}
-ListenAddress {{ listen_address }}
-{% else %}
-{% for address in listen_address %}
+{% for address in listen_address %}
ListenAddress {{ address }}
-{% endfor %}
-{% endif %}
+{% endfor %}
{% endif %}
{% if ciphers %}
diff --git a/data/templates/wifi/hostapd.conf.tmpl b/data/templates/wifi/hostapd.conf.tmpl
index 765668c57..a7efee6d5 100644
--- a/data/templates/wifi/hostapd.conf.tmpl
+++ b/data/templates/wifi/hostapd.conf.tmpl
@@ -500,18 +500,10 @@ wpa=1
{% if security.wpa.mode is defined and security.wpa.mode == 'wpa2' %}
# Pairwise cipher for RSN/WPA2 (default: use wpa_pairwise value)
-{% if security.wpa.cipher is string %}
-rsn_pairwise={{ security.wpa.cipher }}
-{% else %}
rsn_pairwise={{ security.wpa.cipher | join(" ") }}
-{% endif %}
{% else %}
# Pairwise cipher for WPA (v1) (default: TKIP)
-{% if security.wpa.cipher is string %}
-wpa_pairwise={{ security.wpa.cipher }}
-{% else %}
wpa_pairwise={{ security.wpa.cipher | join(" ") }}
-{% endif %}
{% endif %}
{% endif %}
@@ -522,11 +514,7 @@ wpa_pairwise={{ security.wpa.cipher | join(" ") }}
# overriding the group cipher with an unexpected value can result in
# interoperability issues and in general, this parameter is mainly used for
# testing purposes.
-{% if security.wpa.group_cipher is string %}
-group_cipher={{ security.wpa.group_cipher }}
-{% else %}
group_cipher={{ security.wpa.group_cipher | join(" ") }}
-{% endif %}
{% endif %}
{% if security.wpa.passphrase is defined %}