Index: /nodes/CNodeCope/wleiden.conf
===================================================================
--- /nodes/CNodeCope/wleiden.conf	(revision 7928)
+++ /nodes/CNodeCope/wleiden.conf	(revision 7929)
@@ -1,129 +1,75 @@
-#
-#
-#
-#  Read by /usr/local/sbin/wireless-up.pl
 #
 # config CNodeCope
-
-$location = "Cope, Rapenburg 8, 2311 EV,Leiden";
-
+$location = "Cope, Rapenburg 8, 2311 EV, Leiden";
 $master_ip='172.17.8.1';  
 $nodetype='CNode';
 $nodename='Cope';
-$release="5.0-RELEASE";
-
-
+$release="8.0-RELEASE";
 $status='up';
-
-# edugis x,y 93280,463889
 $X='93280';
 $Y='463889';
 
-$config{'ep0'}=sprintf <<ETH0;  # ethernet2cope
-TYPE=ethernet
-IP=172.17.8.65/27
-
-
-DESC=Ethernet naar Cope
-SDESC=eth
-
-DHCP=70-90
-
-
-ETH0
-
-$config{'ep0:0'}=sprintf <<EP00;  # link naar proxy1.demon
+$config{'ue0'}=sprintf <<UE0;  # link naar proxy1
 TYPE=ethernet
 IP=172.31.255.2/28
-DESC=Link naar proxy1.demon
+DESC=Link naar proxy1
 SDESC=2proxy1
+UE0
 
-EP00
-
-
-$config{'wi0'}=sprintf <<EW0;  # OMNI
+$config{'ath0'}=sprintf <<ATH0;  # OMNI
 TYPE=wireless
 IP=$master_ip/26
+DESC=AP voor de buurt
+SDESC=ap
+DHCP=10-60
+MODE=master
+ESSID=ap-WirelessLeiden-Cope
+CHANNEL=5
+ATH0
 
-DESC=Omni voor de buurt
-SDESC=omni
-
-DHCP=10-60
-
-
-MODE=master
-ESSID=omni.cope0.wleiden.net
-CHANNEL=5
-
-
-EW0
-
-
-$config{'wi0:0'}=sprintf <<EW00;  # link naar UniGor
-TYPE=wireless
-IP=172.16.0.93/30
-DESC=Link naar UniGor
-SDESC=2unigor
-
-
-DHCP=no
-EW00
-
-
-#$config{'wi0:1'}=sprintf <<EW01;  # link naar LvLn
-#TYPE=wireless
-#IP=172.16.0.69/30
-#DESC=Link naar LvLn
-#SDESC=2lvln
-#
-#
-#DHCP=no
-#EW01
-
-
-$config{'wi1'}=sprintf <<EW1;  # link naar jorg
-TYPE=wireless
-IP=172.16.0.21/30
-DESC=Link naar Unused
-SDESC=2unused
-
-
-MODE=master
-ESSID=il-zw.cope.wleiden.net
-CHANNEL=13
-
-
-DHCP=no
-
-EW1
-
-
-$config{'wi2'}=sprintf <<EW2;
+$config{'ath0:0'}=sprintf <<ATH00;
 TYPE=wireless
 IP=172.16.0.170/30
 DESC=Link naar Vosko1
 SDESC=2vosko1
+DHCP=no
+ATH00
 
-MODE=managed
-ESSID=il-nw.vosko1.wleiden.net
+$config{'vr0'}=sprintf <<VR0; # a-link naar Unigor via NS5
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.0.93/30
+DESC=Ethernet to interlink UniGor
+SDESC=2unigor
+#Default IP 192.168.1.20 for NS5 management
+#MODE=11a bridge station
+#ESSID=il-Z0.unigor.wleiden.net
+#CHANNEL=
+#NSMAC=
+VR0
 
+$config{'vr1'}=sprintf <<VR1; # a-link naar Stadhuis  via NS5
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.3.214/30
+DESC=Link naar Stadhuis
+SDESC=2stadhuis
+#Default IP 192.168.1.20 for NS5 management
+#MODE=11a bridge managed
+#ESSID=il-nw.stadhuis.wleiden.net
+#CHANNEL=116
+#NSMAC=
+VR1
 
-DHCP=no
-EW2
-
-$config{'wi3'}=sprintf <<EW3;
-TYPE=wireless
+$config{'vr2'}=sprintf <<VR2; # a-link naar Rabo via NS5
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
 IP=172.16.1.154/30
-DESC=Link naar Stadhuis1
-SDESC=2stadhuis1
-
-MODE=managed
-ESSID=ap-w.stadhuis.wleiden.net
-#CHANNEL=10
-
-
-DHCP=no
-
-EW3
-
-
+DESC=ethernet to interlink 
+SDESC=2
+#Default IP 192.168.1.20 for NS5 management
+#MODE=managed
+#ESSID=
+#CHANNEL=44
+#NSMAC=
+VR2