Index: nodes/CNodeMuiderkring/wleiden.conf
===================================================================
--- nodes/CNodeMuiderkring/wleiden.conf	(revision 7576)
+++ nodes/CNodeMuiderkring/wleiden.conf	(revision 7577)
@@ -8,48 +8,23 @@
 $nodetype='CNode';
 $nodename='Muiderkring';
-$release="6.0-STABLE";
+$release="8.0-RELEASE";
 $node_config_version="1";
 $genesis_control="YES";
-
 $OS='FreeBSD';
 $labelpos='right';
-$DISK='FLASH';
-
-#edugis x,y  92318,464324
 $X='92318';
 $Y='464324';
-
 $status='up';
 
-$config{'sis0'}=sprintf <<SIS0;  # eth
-TYPE=ethernet
-IP=172.16.3.145/28
-
-
-DESC=Link naar proxy6
-SDESC=eth
-SPEED=10240000000
-
-DHCP=no
-
-
-SIS0
-
-
-$config{'wi0'}=sprintf <<EW0;  # Lokaal accesspoint
+$config{'ath0'}=sprintf <<ATH0;  # Lokaal accesspoint
 TYPE=wireless
 IP=$master_ip/26
-
 DESC=accesspoint voor de buurt
 SDESC=omni
 SPEED=11534336
-
 DHCP=140-190
-
 MODE=master
 ESSID=ap-omni.muiderkring.wleiden.net
 CHANNEL=5
-
-
 POLAR=Vert
 ANTENNA=PA6060
@@ -59,10 +34,18 @@
 CABLE=3
 HEIGTH=15
+ATH0
 
-EW0
+$config{'vr0'}=sprintf <<VR0;  # eth
+TYPE=ethernet
+IP=172.16.3.145/30
+DESC=Link naar proxy6
+SDESC=eth
+SPEED=10240000000
+DHCP=no
+VR0
 
-
-$config{'wi1'}=sprintf <<EW1;  # Link naar AJSoft
+$config{'vr1'}=sprintf <<VR1;  # Link naar AJSoft
 TYPE=wireless
+EXTRA_TYPE=eth2wifibridge
 IP=172.16.3.118/30
 DESC=Link naar AJSoft
@@ -70,10 +53,8 @@
 SPEED=11534336
 POINT_TO_POINT=172.16.3.117
-
-
-MODE=managed
-ESSID=il-nw.ajsoft.wleiden.net
+#Default IP 192.168.1.20 for bullet2 management
+#MODE=managed
+#ESSID=il-nw.ajsoft.wleiden.net
 #CHANNEL=1
-
 POLAR=Hor
 ANTENNA=PA4040
@@ -83,5 +64,4 @@
 CABLE=3
 HEIGTH=15
-
 DHCP=no
-EW1
+VR1