diff --git a/salt-pillar/cpe/aps.sls b/salt-pillar/cpe/aps.sls index 5936ee7..6c82ed3 100644 --- a/salt-pillar/cpe/aps.sls +++ b/salt-pillar/cpe/aps.sls @@ -106,6 +106,7 @@ cpe: wpa-eap: server: radius.hq.c3d2.de port: 1812 + secret: public ap3: password: | @@ -173,6 +174,7 @@ cpe: wpa-eap: server: radius.hq.c3d2.de port: 1812 + secret: public ap4: password: | diff --git a/salt/cpe/ap.sh b/salt/cpe/ap.sh index 6ac771e..552de91 100644 --- a/salt/cpe/ap.sh +++ b/salt/cpe/ap.sh @@ -330,6 +330,7 @@ set wireless.wifi{{ index.iface }}.key='{{ ssidconf['psk'] }}' set wireless.wifi{{ index.iface }}.encryption=wpa2 set wireless.wifi{{ index.iface }}.server='{{ ssidconf['wpa-eap']['server'] }}' set wireless.wifi{{ index.iface }}.port='{{ ssidconf['wpa-eap']['port'] }}' +set wireless.wifi{{ index.iface }}.port='{{ ssidconf['wpa-eap']['secret'] }}' {%- else %} set wireless.wifi{{ index.iface }}.encryption=none {%- endif %}