summaryrefslogtreecommitdiff
path: root/src/conf_mode
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2019-11-18 20:32:40 +0100
committerChristian Poessinger <christian@poessinger.com>2019-11-23 20:44:02 +0100
commit6ab442158bd036605b792b9345530541ff45213a (patch)
treebc5c51410979e8ae124d03c9dae9e8ad15e3d31c /src/conf_mode
parent8c65e146c7fedad0cf7904f6997d1b3e45d0d80b (diff)
downloadvyos-1x-6ab442158bd036605b792b9345530541ff45213a.tar.gz
vyos-1x-6ab442158bd036605b792b9345530541ff45213a.zip
wireless: T1627: re-order WPA key in hostapd config
Diffstat (limited to 'src/conf_mode')
-rwxr-xr-xsrc/conf_mode/interfaces-wireless.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/conf_mode/interfaces-wireless.py b/src/conf_mode/interfaces-wireless.py
index 3a17b1480..b25205590 100755
--- a/src/conf_mode/interfaces-wireless.py
+++ b/src/conf_mode/interfaces-wireless.py
@@ -608,6 +608,12 @@ wpa_pairwise={{ sec_wpa_cipher | join(" ") }}
# bit 1 = Shared Key Authentication (requires WEP)
auth_algs=1
+# WPA pre-shared keys for WPA-PSK. This can be either entered as a 256-bit
+# secret in hex format (64 hex digits), wpa_psk, or as an ASCII passphrase
+# (8..63 characters) that will be converted to PSK. This conversion uses SSID
+# so the PSK changes when ASCII passphrase is used and the SSID is changed.
+wpa_passphrase={{ sec_wpa_passphrase }}
+
# Set of accepted key management algorithms (WPA-PSK, WPA-EAP, or both). The
# entries are separated with a space. WPA-PSK-SHA256 and WPA-EAP-SHA256 can be
# added to enable SHA256-based stronger algorithms.
@@ -615,12 +621,6 @@ auth_algs=1
# WPA-PSK-SHA256 = WPA2-Personal using SHA256
wpa_key_mgmt=WPA-PSK
-# WPA pre-shared keys for WPA-PSK. This can be either entered as a 256-bit
-# secret in hex format (64 hex digits), wpa_psk, or as an ASCII passphrase
-# (8..63 characters) that will be converted to PSK. This conversion uses SSID
-# so the PSK changes when ASCII passphrase is used and the SSID is changed.
-wpa_passphrase={{ sec_wpa_passphrase }}
-
{% elif sec_wpa_radius -%}
##### IEEE 802.1X-2004 related configuration ##################################
# Require IEEE 802.1X authorization