configurable server and port

salt-pillar/cpe/aps.sls

@@ -103,7 +103,9 @@ cpe:
               -----END PGP MESSAGE-----
          'C3D2.eap':
            net: c3d2
-           wpa-eap: yes
+           wpa-eap:
+            server: radius.hq.c3d2.de
+            port: 1812
 
   ap3:
     password: |

salt/cpe/ap.sh

@@ -324,8 +324,8 @@ set wireless.wifi{{ ifnum }}.encryption=psk2
 set wireless.wifi{{ ifnum }}.key='{{ ssidconf['psk'] }}'
 {%-     elif ssidconf.get('wpa-eap') %}
 set wireless.wifi({ ifnum }).encryption=wpa2
-set wireless.wifi({ ifnum }).server=radius.hq.c3d2.de
-set wireless.wifi({ ifnum }).port=1812
+set wireless.wifi({ ifnum }).server='{{ ssidconf['wpa-eap']['server'] }}'
+set wireless.wifi({ ifnum }).port='{{ ssidconf['wpa-eap']['port'] }}'
 {%-     else %}
 set wireless.wifi{{ ifnum }}.encryption=none
 {%-     endif %}