Merge pull request #34 from zentralwerk/eap

noauth eap with radius.hq.c3d2

salt-pillar/cpe/aps.sls

@@ -101,6 +101,11 @@ cpe:
               rA==
               =TEEI
               -----END PGP MESSAGE-----
+         'C3D2.eap':
+           net: c3d2
+           wpa-eap:
+            server: radius.hq.c3d2.de
+            port: 1812
 
   ap3:
     password: |
@@ -163,6 +168,11 @@ cpe:
               rA==
               =TEEI
               -----END PGP MESSAGE-----
+         'C3D2.eap':
+           net: c3d2
+           wpa-eap:
+            server: radius.hq.c3d2.de
+            port: 1812
 
   ap4:
     password: |

salt/cpe/ap.sh

@@ -322,6 +322,10 @@ set wireless.wifi{{ ifnum }}.network={{ ssidconf['net'] }}
 {%-     if ssidconf.get('psk') %}
 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='{{ ssidconf['wpa-eap']['server'] }}'
+set wireless.wifi({ ifnum }).port='{{ ssidconf['wpa-eap']['port'] }}'
 {%-     else %}
 set wireless.wifi{{ ifnum }}.encryption=none
 {%-     endif %}

salt/firewall/mgmt-gw.sh

@@ -19,6 +19,8 @@ ip6tables -A FORWARD -i $IFACE -p udp --dport 25826 -j ACCEPT
 # downloads.lede-project.org
 iptables -A FORWARD -i $IFACE --dest 148.251.78.235 -j ACCEPT
 ip6tables -A FORWARD -i $IFACE --dest 2a01:4f8:202:43ea::3 -j ACCEPT
+# radius.hq.c3d2.de
+iptables -A FORWARD -i $IFACE --dest 172.22.99.22 -j ACCEPT
 # Deny by default
 iptables -A FORWARD -j REJECT
 ip6tables -A FORWARD -j REJECT