summaryrefslogtreecommitdiff
path: root/data/templates/wifi
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/templates/wifi
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/templates/wifi')
-rw-r--r--data/templates/wifi/hostapd.conf.tmpl12
1 files changed, 0 insertions, 12 deletions
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 %}