Index: nodes/CNodeUniGor/wleiden.conf
===================================================================
--- nodes/CNodeUniGor/wleiden.conf	(revision 7934)
+++ nodes/CNodeUniGor/wleiden.conf	(revision 7935)
@@ -20,31 +20,25 @@
 $Y='464813';
 
-$config{'ath0'}=sprintf <<ATH0;  # B link naar Cope
+$config{'ath0'}=sprintf <<ATH0;  # AP Richting oost
 TYPE=wireless
-IP=172.16.0.94/30
-DESC=Link naar Cope
-SDESC=2cope
-MODE=managed
-ESSID=omni.cope0.wleiden.net
-DHCP=no
+IP=$master_ip/26
+DESC=AP Richting O
+SDESC=no
+DHCP=10-60
+MODE=master
+ESSID=ap-WirelessLeiden-Unigor-oost
+CHANNEL=2
 ATH0
 
-$config{'vr0'}=sprintf <<VR0;  # B link naar Robijn via Bullet 1
+$config{'vr0'}=sprintf <<VR0;  # AP Richting zuid via Bullet 1
 TYPE=ethernet
-IP=172.16.1.29/30
-DESC=Link naar Robijn
-SDESC=2robijn
-DHCP=no
+IP=172.22.8.1/26
+DESC=AP Richting Z
+SDESC=no
+DHCP=10-60
 #MODE=master
-#ESSID=il-z.unigor.wleiden.net
-#CHANNEL=11
+#ESSID=ap-WirelessLeiden-Unigor-zuid
+#CHANNEL=7
 VR0
-
-$config{'vr0:0'}=sprintf <<VR00;  # B Link naar Zwaluwak via Bullet 1
-TYPE=ethernet
-IP=172.16.1.253/30
-DESC=Link naar Zwaluwak
-SDESC=2zwaluwak
-VR00
 
 $config{'vr1'}=sprintf <<VR1;  # A link naar Cope via nanostation 1
@@ -77,10 +71,10 @@
 VR20
 
-$config{'vr3'}=sprintf <<VR3;  # AP richting NO via bullet 2
+$config{'vr3'}=sprintf <<VR3;   # Link naar AZC via bullet 2
 TYPE=ethernet
-IP=$master_ip/26
-DESC=AP Richting NO
-SDESC=no
-DHCP=10-60
+IP=172.16.0.165/30
+DESC=Link naar AZC
+SDESC=2azc
+DHCP=no
 #MODE=master
 #ESSID=n-o.unigor.wleiden.net
@@ -88,13 +82,5 @@
 VR3
 
-$config{'vr3:0'}=sprintf <<VR30;   # Link naar AZC via bullet 2
-TYPE=ethernet
-IP=172.16.0.165/30
-DESC=Link naar AZC
-SDESC=2azc
-DHCP=no
-VR30
-
-$config{'vr3:1'}=sprintf <<VR31;  # Link naar Brug via bullet 2
+$config{'vr3:0'}=sprintf <<VR30;  # Link naar Brug via bullet 2
 TYPE=ethernet
 IP=172.16.0.17/30
@@ -102,7 +88,7 @@
 SDESC=2brug
 DHCP=no
-VR31
+VR30
 
-$config{'vr3:2'}=sprintf <<VR32;  # Link naar Camimplants via bullet 2
+$config{'vr3:1'}=sprintf <<VR31;  # Link naar Camimplants via bullet 2
 TYPE=ethernet
 IP=172.16.1.117/30
@@ -110,5 +96,5 @@
 SDESC=2camimplants
 DHCP=no
-VR32
+VR31
 
 $config{'sis0'}=sprintf <<SIS0;  # a-link Nanostation5 naar DirkLos2
@@ -121,5 +107,5 @@
 SIS0
 
-#$config{'vr4:0'}=sprintf <<VR40;  # management Nanostation5
+#$config{'sis0:0'}=sprintf <<SIS00;  # management Nanostation5
 #TYPE=ethernet
 #IP=172.16.3.113/30
@@ -131,5 +117,5 @@
 #CHANNEL=
 #mode 11a bridge master
-#VR40
+#SIS00
 
 $config{'sis1'}=sprintf <<SIS1;  # EthernetLink UniGorN