Changeset 8261 in genesis


Ignore:
Timestamp:
Aug 8, 2010, 12:14:27 PM (14 years ago)
Author:
rick
Message:
  • Commented variables are kind of useless as no program will be able to parse them. So made them 'active'
  • The text behind the $config proves to be a more usefull description than the normal DESC field, pushed them into a variable called COMMENT so we can finally start using them.
  • Commented code is in general bad stuff with a revision control system as it clutters the view, made the non active interface just 'idle' active.
Location:
nodes
Files:
109 edited

Legend:

Unmodified
Added
Removed
  • nodes/CNodeAA24/wleiden.conf

    r8260 r8261  
    2020#$AGGREGATE=22;
    2121
    22 $config{'ep0'}=sprintf <<ED0;  # eth
     22$config{'ep0'}=sprintf <<ED0;
     23COMMENT=eth
    2324TYPE=ethernet
    2425IP=172.25.136.65/29
     
    3536
    3637
    37 $config{'wi0'}=sprintf <<EW0;  # OMNI
     38$config{'wi0'}=sprintf <<EW0;
     39COMMENT=OMNI
    3840TYPE=wireless
    3941IP=$master_ip/26
     
    5355EW0
    5456
    55 $config{'wi1'}=sprintf <<EW1;  # link naar Hans
     57$config{'wi1'}=sprintf <<EW1;
     58COMMENT=link naar Hans
    5659TYPE=wireless
    5760IP=172.16.2.42/30
     
    6568MODE=managed
    6669ESSID=il-w.hans.wleiden.net
    67 #CHANNEL=4
     70CHANNEL=4
    6871
    6972
     
    7275EW1
    7376
    74 $config{'wi2'}=sprintf <<EW2;  # link naar roomburgh2
     77$config{'wi2'}=sprintf <<EW2;
     78COMMENT=link naar roomburgh2
    7579TYPE=wireless
    7680IP=172.16.0.246/30
     
    8286MODE=managed
    8387ESSID=il-zo.roomburgh2.wleiden.net
    84 #CHANNEL=5
     88CHANNEL=5
    8589
    8690
  • nodes/CNodeAJSoft1/wleiden.conf

    r8136 r8261  
    1010$Y='462384';
    1111
    12 $config{'ath0'}=sprintf <<ATH0;  # ap
     12$config{'ath0'}=sprintf <<ATH0;
     13COMMENT=ap
    1314TYPE=wireless
    1415IP=$master_ip/26
     
    2122ATH0
    2223
    23 $config{'vr0'}=sprintf <<VR0;  # Ethernet naar AJSoft2
     24$config{'vr0'}=sprintf <<VR0;
     25COMMENT=Ethernet naar AJSoft2
    2426TYPE=ethernet
    2527IP=172.16.3.81/30
     
    2931VR0
    3032
    31 $config{'vr1'}=sprintf <<VR1;  # link naar Haagwijk
     33$config{'vr1'}=sprintf <<VR1;
     34COMMENT=link naar Haagwijk
    3235TYPE=ethernet
    3336EXTRA_TYPE=eth2wifibridge
     
    3639SDESC=2haagwijk
    3740DHCP=no
    38 #MODE=managed
    39 #ESSID=il-nw.haagwijk.wleiden.net
    40 #CHANNEL=52
    41 #NSMAC=00:15:6D:EA:EB:D5
    42 #NS_IP=192.168.1.21
     41MODE=managed
     42ESSID=il-nw.haagwijk.wleiden.net
     43CHANNEL=52
     44NSMAC=00:15:6D:EA:EB:D5
     45NS_IP=192.168.1.21
    4346VR1
    4447
    45 $config{'vr2'}=sprintf <<VR2; # Link naar Robijn
     48$config{'vr2'}=sprintf <<VR2;
     49COMMENT=Link naar Robijn
    4650TYPE=ethernet
    4751EXTRA_TYPE=eth2wifibridge
     
    5054SDESC=2robijn
    5155DHCP=no
    52 #MODE=bridge ap
    53 #ESSID=il-nnw.ajsoft1.wleiden.net
    54 #CHANNEL=60
    55 #NSMAC=00:15:6D:EC:82:8A
    56 #NS_IP=192.168.1.20
     56MODE=bridge ap
     57ESSID=il-nnw.ajsoft1.wleiden.net
     58CHANNEL=60
     59NSMAC=00:15:6D:EC:82:8A
     60NS_IP=192.168.1.20
    5761VR2
    5862
    59 $config{'ue0'}=sprintf <<UE0; # Link naar RijnVliet
     63$config{'ue0'}=sprintf <<UE0;
     64COMMENT=Link naar RijnVliet
    6065TYPE=ethernet
    6166EXTRA_TYPE=eth2wifibridge
     
    6469SDESC=b2rijnvliet
    6570DHCP=no
    66 #MODE=bridge managed
    67 #ESSID=il-zw.rv.wleiden.net
    68 #CHANNEL=4
    69 #BulletMAC=00:15:6D:E8:F9:B1
    70 #BulletIP=192.168.1.21
     71MODE=bridge managed
     72ESSID=il-zw.rv.wleiden.net
     73CHANNEL=4
     74BulletMAC=00:15:6D:E8:F9:B1
     75BulletIP=192.168.1.21
    7176UE0
  • nodes/CNodeAJSoft2/wleiden.conf

    r8136 r8261  
    99$Y='462384';
    1010
    11 $config{'ath0'}=sprintf <<ATH0;  # link livinglab
     11$config{'ath0'}=sprintf <<ATH0;
     12COMMENT=link livinglab
    1213TYPE=wireless
    1314IP=172.16.2.242/30
     
    1516SDESC=2livinglab
    1617DHCP=no
    17 #MODE=bridge managed
    18 #ESSID=il-n.livinglab.wleiden.net
    19 #CHANNEL=36
     18MODE=bridge managed
     19ESSID=il-n.livinglab.wleiden.net
     20CHANNEL=36
    2021ATH0
    2122
    22 $config{'vr0'}=sprintf <<VR0;  # Ethernet naar AJSoft1
     23$config{'vr0'}=sprintf <<VR0;
     24COMMENT=Ethernet naar AJSoft1
    2325TYPE=ethernet
    2426IP=172.16.3.82/30
     
    2830VR0
    2931
    30 $config{'vr1'}=sprintf <<VR1;  # link naar Hofland
     32$config{'vr1'}=sprintf <<VR1;
     33COMMENT=link naar Hofland
    3134TYPE=ethernet
    3235EXTRA_TYPE=eth2wifibridge
     
    3538SDESC=2hofland
    3639DHCP=no
    37 #MODE=bridge ap
    38 #ESSID=il-w.ajsoft2.wleiden.net
    39 #CHANNEL=100
    40 #NSMAC=00:15:6D:EA:F0:6A
    41 #NS_IP=192.168.1.20
     40MODE=bridge ap
     41ESSID=il-w.ajsoft2.wleiden.net
     42CHANNEL=100
     43NSMAC=00:15:6D:EA:F0:6A
     44NS_IP=192.168.1.20
    4245VR1
    4346
    44 $config{'vr2'}=sprintf <<VR2; # Link naar oost
     47$config{'vr2'}=sprintf <<VR2;
     48COMMENT=Link naar oost
    4549TYPE=ethernet
    4650EXTRA_TYPE=eth2wifibridge
     
    4953SDESC=a2rijnvliet
    5054DHCP=no
    51 #MODE=bridge ap
    52 #ESSID=il-o-ajsoft2.wleiden.net
    53 #CHANNEL=52
    54 #NSMAC=00:15:6D:EA:F0:6D
    55 #NS_IP=192.168.1.20
     55MODE=bridge ap
     56ESSID=il-o-ajsoft2.wleiden.net
     57CHANNEL=52
     58NSMAC=00:15:6D:EA:F0:6D
     59NS_IP=192.168.1.20
    5660VR2
    5761
    58 $config{'ue0'}=sprintf <<UE0;  # Link naar Muiderkring
     62$config{'ue0'}=sprintf <<UE0;
     63COMMENT=Link naar Muiderkring
    5964TYPE=ethernet
    6065EXTRA_TYPE=eth2wifibridge
     
    6368SDESC=2muiderkring
    6469DHCP=no
    65 #MODE=bridge ap
    66 #ESSID=il-nno.ajsoft2.wleiden.net
    67 #CHANNEL=8
    68 #BulletMAC=00:15:6D:E8:F9:C6
    69 #BulletIP=192.168.1.20
     70MODE=bridge ap
     71ESSID=il-nno.ajsoft2.wleiden.net
     72CHANNEL=8
     73BulletMAC=00:15:6D:E8:F9:C6
     74BulletIP=192.168.1.20
    7075UE0
  • nodes/CNodeAMWaterT1/wleiden.conf

    r7657 r8261  
    1717$AGGREGATE=22;
    1818
    19 $config{'sis0'}=sprintf <<ED0;  # ethernet poort 0 Soekris  (naar het internet)
     19$config{'sis0'}=sprintf <<ED0;
     20COMMENT=ethernet poort 0 Soekris  (naar het internet)
    2021TYPE=ethernet
    2122IP=172.25.90.65/29
     
    2526ED0
    2627
    27 $config{'sis1'}=sprintf <<ED1;  # ethernet poort 1  op Soekris
     28$config{'sis1'}=sprintf <<ED1;
     29COMMENT=ethernet poort 1  op Soekris
    2830TYPE=ethernet
    2931IP=172.16.2.121/30
     
    3335ED1
    3436
    35 $config{'ath0'}=sprintf <<EW0;  # OMNI voor Wifi op de westeinder
     37$config{'ath0'}=sprintf <<EW0;
     38COMMENT=OMNI voor Wifi op de westeinder
    3639TYPE=wireless
    3740IP=$master_ip/26
     
    4548EW0
    4649
    47 $config{'wi0'}=sprintf <<EW1;  # Link naar LMkepers Leimuiden
     50$config{'wi0'}=sprintf <<EW1;
     51COMMENT=Link naar LMkepers Leimuiden
    4852TYPE=wireless
    4953IP=172.16.1.210/30
     
    5761EW1
    5862
    59 $config{'wi1'}=sprintf <<EW2;  # link Node drijfhuis
     63$config{'wi1'}=sprintf <<EW2;
     64COMMENT=link Node drijfhuis
    6065TYPE=wireless
    6166IP=172.16.2.125/30
     
    6873EW2
    6974
    70 $config{'wi1:0'}=sprintf <<EW20; #link naar Node Recpark
     75$config{'wi1:0'}=sprintf <<EW20;
     76COMMENT=link naar Node Recpark
    7177TYPE=wireless
    7278IP=172.16.2.129/30
  • nodes/CNodeAMWaterT2/wleiden.conf

    r8260 r8261  
    1717$AGGREGATE=22;
    1818
    19 $config{'sis0'}=sprintf <<ED0;  # ethernet poort 0 Soekris
     19$config{'sis0'}=sprintf <<ED0;
     20COMMENT=ethernet poort 0 Soekris
    2021TYPE=ethernet
    2122IP=172.25.94.65/29
     
    2930ED0
    3031
    31 $config{'sis1'}=sprintf <<ED1;  # ethernet poort 1 naar node watertoren 1
     32$config{'sis1'}=sprintf <<ED1;
     33COMMENT=ethernet poort 1 naar node watertoren 1
    3234TYPE=ethernet
    3335IP=172.16.2.122/30
     
    4244ED1
    4345
    44 $config{'wi0'}=sprintf <<EW0;  # OMNI voor Watertoren
     46$config{'wi0'}=sprintf <<EW0;
     47COMMENT=OMNI voor Watertoren
    4548TYPE=wireless
    4649IP=$master_ip/26
     
    5962EW0
    6063
    61 $config{'wi1'}=sprintf <<EW1;  # link naar onbekend
     64$config{'wi1'}=sprintf <<EW1;
     65COMMENT=link naar onbekend
    6266TYPE=wireless
    6367IP=172.16.16.59/30
  • nodes/CNodeAMdrijfhuis/wleiden.conf

    r7657 r8261  
    1717$AGGREGATE=22;
    1818
    19 $config{'sis0'}=sprintf <<ED0;  # ethernet poort 0 Soekris
     19$config{'sis0'}=sprintf <<ED0;
     20COMMENT=ethernet poort 0 Soekris
    2021TYPE=ethernet
    2122IP=172.25.99.65/29
     
    2930ED0
    3031
    31 $config{'ath0'}=sprintf <<EW0;  # OMNI voor Wifi rondom drijfhuis in Aalsmeer
     32$config{'ath0'}=sprintf <<EW0;
     33COMMENT=OMNI voor Wifi rondom drijfhuis in Aalsmeer
    3234TYPE=wireless
    3335IP=$master_ip/26
     
    4244EW0
    4345
    44 $config{'wi0'}=sprintf <<EW0;  # Link naar Watertoren Aalsmeer
     46$config{'wi0'}=sprintf <<EW0;
     47COMMENT=Link naar Watertoren Aalsmeer
    4548TYPE=wireless
    4649IP=172.16.2.126/30
  • nodes/CNodeAMrecpark/wleiden.conf

    r7657 r8261  
    1717$AGGREGATE=22;
    1818
    19 $config{'sis0'}=sprintf <<ED0;  # ethernet poort 0 Soekris
     19$config{'sis0'}=sprintf <<ED0;
     20COMMENT=ethernet poort 0 Soekris
    2021TYPE=ethernet
    2122IP=172.25.98.65/29
     
    2930ED0
    3031
    31 $config{'ath0'}=sprintf <<EW0;  # OMNI voor Wifi rondom Recreatiepark Aalsmeer
     32$config{'ath0'}=sprintf <<EW0;
     33COMMENT=OMNI voor Wifi rondom Recreatiepark Aalsmeer
    3234TYPE=wireless
    3335IP=$master_ip/26
     
    4648EW0
    4749
    48 $config{'wi0'}=sprintf <<EW1;  # Link naar Watertoren Aalsmeer
     50$config{'wi0'}=sprintf <<EW1;
     51COMMENT=Link naar Watertoren Aalsmeer
    4952TYPE=wireless
    5053IP=172.16.2.130/30
  • nodes/CNodeAZC/wleiden.conf

    r7657 r8261  
    1919$Y='465207';
    2020
    21 $config{'ep0'}=sprintf <<ED0;  # Ethernet
     21$config{'ep0'}=sprintf <<ED0;
     22COMMENT=Ethernet
    2223TYPE=ethernet
    2324IP=172.19.144.65/26
     
    3132ED0
    3233
    33 $config{'wi0'}=sprintf <<EW0;  #link naar Lijtweg2
     34$config{'wi0'}=sprintf <<EW0;
     35COMMENT=link naar Lijtweg2
    3436TYPE=wireless
    3537IP=172.16.1.97/30
     
    4850EW0
    4951
    50 $config{'wi0:0'}=sprintf <<EW00;  #link naar Endegeest
     52$config{'wi0:0'}=sprintf <<EW00;
     53COMMENT=link naar Endegeest
    5154TYPE=wireless
    5255IP=172.19.144.129/28
     
    5760
    5861
    59 $config{'wi1'}=sprintf <<EW1;    #link naar WP
     62$config{'wi1'}=sprintf <<EW1;
     63COMMENT=link naar WP
    6064TYPE=wireless
    6165#11=Wandy WP depedance
     
    7680EW1
    7781
    78 $config{'wi1:0'}=sprintf <<EW10;  # Link naar Wissel
     82$config{'wi1:0'}=sprintf <<EW10;
     83COMMENT=Link naar Wissel
    7984TYPE=wireless
    8085IP=172.16.2.53/30
     
    8590
    8691
    87 $config{'wi1:1'}=sprintf <<EW11;  # Link naar Eddy
     92$config{'wi1:1'}=sprintf <<EW11;
     93COMMENT=Link naar Eddy
    8894TYPE=wireless
    8995IP=172.16.2.113/30
     
    94100
    95101
    96 $config{'wi2'}=sprintf <<EW2;  # link naar Rabo
     102$config{'wi2'}=sprintf <<EW2;
     103COMMENT=link naar Rabo
    97104TYPE=wireless
    98105IP=172.16.0.222/30
     
    111118EW2
    112119
    113 $config{'wi3'}=sprintf <<EW3;  # Link naar Unigor
     120$config{'wi3'}=sprintf <<EW3;
     121COMMENT=Link naar Unigor
    114122TYPE=wireless
    115123IP=172.16.0.166/30
  • nodes/CNodeAster/wleiden.conf

    r7689 r8261  
    1414$Y='466945';
    1515
    16 $config{'ath0'}=sprintf <<ED1;  # omni voor de buurt
     16$config{'ath0'}=sprintf <<ED1;
     17COMMENT=omni voor de buurt
    1718TYPE=wireless
    1819IP=$master_ip/26
     
    2627ED1
    2728
    28 $config{'vr0'}=sprintf <<VR0;  # local subnet with PoE
     29$config{'vr0'}=sprintf <<VR0;
     30COMMENT=local subnet with PoE
    2931TYPE=ethernet
    3032IP=172.23.26.65/28
     
    3436VR0
    3537
    36 $config{'vr1'}=sprintf <<VR1;  # link naar lijtweg1 bridge
     38$config{'vr1'}=sprintf <<VR1;
     39COMMENT=link naar lijtweg1 bridge
    3740TYPE=ethernet
    3841EXTRA_TYPE=eth2wifibridge
     
    4144SDESC=aster2lijtweg1
    4245DHCP=no
    43 #ESSID=il-w.lijtweg1.wleiden.net
     46ESSID=il-w.lijtweg1.wleiden.net
    4447VR1
    4548
  • nodes/CNodeBCSte/wleiden.conf

    r8150 r8261  
    1111$Y='462885';
    1212
    13 $config{'ath0'}=sprintf <<ATH0;   # Omni
     13$config{'ath0'}=sprintf <<ATH0;
     14COMMENT=Omni
    1415TYPE=wireless
    1516IP=$master_ip/26
     
    2223ATH0
    2324
    24 $config{'vr0'}=sprintf <<VR0;  # Ethernet naar BCSte
     25$config{'vr0'}=sprintf <<VR0;
     26COMMENT=Ethernet naar BCSte
    2527TYPE=ethernet
    2628IP=172.24.0.65/26
     
    3032VR0
    3133
    32 $config{'vr1'}=sprintf <<VR1; # b-link naar Zwaluw
     34$config{'vr1'}=sprintf <<VR1;
     35COMMENT=b-link naar Zwaluw
    3336TYPE=ethernet
    3437EXTRA_TYPE=eth2wifibridge
     
    3740SDESC=2zwaluwak
    3841DHCP=no
    39 #MODE=bridge-ap
    40 #ESSID=il-nw.bcste.wleiden.net
    41 #CHANNEL=1
    42 #BulletMAC=
    43 #BulletIP=172.16.3.250/29
     42MODE=bridge-ap
     43ESSID=il-nw.bcste.wleiden.net
     44CHANNEL=1
     45BulletMAC=
     46BulletIP=172.16.3.250/29
    4447VR1
    4548
    46 $config{'vr2'}=sprintf <<VR2; # link Vosko2
     49$config{'vr2'}=sprintf <<VR2;
     50COMMENT=link Vosko2
    4751TYPE=ethernet
    4852EXTRA_TYPE=eth2wifibridge
     
    5155DESC=interlink o (Vosko2)
    5256SDESC=2vosko2
    53 #MODE=bridge=station
    54 #ESSID=il-w.vosko2.wleiden.net
    55 #CHANNEL=140
    56 #NSIP=172.16.3.154/29
    57 #NSMAC=00:15:6D:
     57MODE=bridge=station
     58ESSID=il-w.vosko2.wleiden.net
     59CHANNEL=140
     60NSIP=172.16.3.154/29
     61NSMAC=00:15:6D:
    5862VR2
    5963
  • nodes/CNodeBDboon/wleiden.conf

    r7657 r8261  
    1717$LOCATION='v.d. Boon, Bilderdam';
    1818
    19 $config{'sis0'}=sprintf <<ED0;  # eth
     19$config{'sis0'}=sprintf <<ED0;
     20COMMENT=eth
    2021TYPE=ethernet
    2122IP=172.25.41.65/29
     
    2425SDESC=eth
    2526DHCP=68-70
    26 #DHCP=no
     27DHCP=no
    2728
    2829ED0
    2930
    30 $config{'wi0'}=sprintf <<EW0;  # OMNI
     31$config{'wi0'}=sprintf <<EW0;
     32COMMENT=OMNI
    3133TYPE=wireless
    3234IP=$master_ip/26
     
    4446EW0
    4547
    46 $config{'wi1'}=sprintf <<EW1;  # link naar kempers
     48$config{'wi1'}=sprintf <<EW1;
     49COMMENT=link naar kempers
    4750TYPE=wireless
    4851IP=172.16.1.214/30
     
    5962EW1
    6063
    61 $config{'wi2'}=sprintf <<EW2;  # link naar RWGemhuis
     64$config{'wi2'}=sprintf <<EW2;
     65COMMENT=link naar RWGemhuis
    6266TYPE=wireless
    6367IP=172.16.3.8/30
  • nodes/CNodeBroekplein/wleiden.conf

    r8047 r8261  
    1111$Y='466097';
    1212
    13 $config{'ath0'}=sprintf <<ATH0; # AP omni
     13$config{'ath0'}=sprintf <<ATH0;
     14COMMENT=AP omni
    1415TYPE=wireless
    1516IP=$master_ip/26
     
    2324
    2425
    25 $config{'ue0'}=sprintf <<UE0;  # Ethernet
     26$config{'ue0'}=sprintf <<UE0;
     27COMMENT=Ethernet
    2628TYPE=ethernet
    2729IP=172.21.144.65/28
     
    3133UE0
    3234
    33 $config{'vr0'}=sprintf <<VR0; # a-link naar SOM via Nanostation5
     35$config{'vr0'}=sprintf <<VR0;
     36COMMENT=a-link naar SOM via Nanostation5
    3437TYPE=ethernet
    3538EXTRA_TYPE=eth2wifibridge
     
    3841DESC=Link naar SOM
    3942SDESC=2som
    40 #MODE=managed
    41 #ESSID=il-n.som1.wleiden.net
    42 #CHANNEL=132
    43 #NSMAC=
     43MODE=managed
     44ESSID=il-n.som1.wleiden.net
     45CHANNEL=132
     46NSMAC=
    4447VR0
    4548
    46 $config{'vr1'}=sprintf <<VR1; # link naar Rosmolen
     49$config{'vr1'}=sprintf <<VR1;
     50COMMENT=link naar Rosmolen
    4751TYPE=ethernet
    4852EXTRA_TYPE=eth2wifibridge
     
    5155IP=172.16.0.210/30
    5256DHCP=no
    53 #MODE=ap
    54 #ESSID=il-z.broekplein.wleiden.net
    55 #CHANNEL=36
    56 #NSMAC=
     57MODE=ap
     58ESSID=il-z.broekplein.wleiden.net
     59CHANNEL=36
     60NSMAC=
    5761VR1
    5862
    59 $config{'vr2'}=sprintf <<VR2; # link naar Lijtweg
     63$config{'vr2'}=sprintf <<VR2;
     64COMMENT=link naar Lijtweg
    6065TYPE=ethernet
    6166EXTRA_TYPE=eth2wifibridge
     
    6469DESC=Link naar Lijtweg
    6570SDESC=2lijtweg1
    66 #MODE=ap
    67 #ESSID=il-w.broekplein.wleiden.net
    68 #CHANNEL=44
    69 #NSMAC=
     71MODE=ap
     72ESSID=il-w.broekplein.wleiden.net
     73CHANNEL=44
     74NSMAC=
    7075VR2
  • nodes/CNodeBrug/wleiden.conf

    r8260 r8261  
    1717$status='up';
    1818
    19 $config{'sis0'}=sprintf <<SIS0;  # eth
     19$config{'sis0'}=sprintf <<SIS0;
     20COMMENT=eth
    2021TYPE=ethernet
    2122IP=172.19.160.65/29
     
    3132
    3233
    33 $config{'wi0'}=sprintf <<EW0;  # Locale Omni
     34$config{'wi0'}=sprintf <<EW0;
     35COMMENT=Locale Omni
    3436TYPE=wireless
    3537IP=$master_ip/26
     
    4951
    5052
    51 $config{'wi1'}=sprintf <<EW1;  # Link naar Unigor
     53$config{'wi1'}=sprintf <<EW1;
     54COMMENT=Link naar Unigor
    5255TYPE=wireless
    5356IP=172.16.0.18/30
     
    6467EW1
    6568
    66 $config{'wi2'}=sprintf <<EW2;  # Link naar Lijtweg2
     69$config{'wi2'}=sprintf <<EW2;
     70COMMENT=Link naar Lijtweg2
    6771TYPE=wireless
    6872IP=172.16.1.178/30
  • nodes/CNodeCam/wleiden.conf

    r8260 r8261  
    1212$status='up';
    1313
    14 $config{'ath0'}=sprintf <<ATH0;  # Lokale Omni
     14$config{'ath0'}=sprintf <<ATH0;
     15COMMENT=Lokale Omni
    1516TYPE=wireless
    1617IP=$master_ip/26
     
    2324ATH0
    2425
    25 $config{'vr0'}=sprintf <<VR0;  # eth
     26$config{'vr0'}=sprintf <<VR0;
     27COMMENT=eth
    2628TYPE=ethernet
    2729IP=172.19.174.65/29
     
    3133VR0
    3234
    33 $config{'vr1'}=sprintf <<VR1;  # Link naar Unigor
     35$config{'vr1'}=sprintf <<VR1;
     36COMMENT=Link naar Unigor
    3437TYPE=ethernet
    3538EXTRA_TYPE=eth2wifibridge
     
    3841SDESC=2Unigor
    3942DHCP=no
    40 #MODE=managed
    41 #ESSID=n-o.unigor.wleiden.net
    42 #CHANNEL=1
     43MODE=managed
     44ESSID=n-o.unigor.wleiden.net
     45CHANNEL=1
    4346VR1
    4447
    45 $config{'vr2'}=sprintf <<VR2; # Link naar DirkLos1
     48$config{'vr2'}=sprintf <<VR2;
     49COMMENT=Link naar DirkLos1
    4650TYPE=ethernet
    4751EXTRA_TYPE=eth2wifibridge
     
    4953DESC=Link naar DirkLos1
    5054SDESC=2dirklos1
    51 #MODE=managed
    52 #ESSID=il-w.dirklos1.wleiden.net
    53 #CHANNEL=13
     55MODE=managed
     56ESSID=il-w.dirklos1.wleiden.net
     57CHANNEL=13
    5458VR2
  • nodes/CNodeCeTIM1/wleiden.conf

    r8049 r8261  
    1212$Y='463704';
    1313
    14 $config{'ath0'}=sprintf <<ATH0;  # ap's N+O
     14$config{'ath0'}=sprintf <<ATH0;
     15COMMENT=ap's N+O
    1516TYPE=wireless
    1617IP=$master_ip/26
     
    2324ATH0
    2425
    25 $config{'vr0'}=sprintf <<VR0;  # Ethernet naar proxy2
     26$config{'vr0'}=sprintf <<VR0;
     27COMMENT=Ethernet naar proxy2
    2628TYPE=ethernet
    2729IP=172.17.143.2/28
     
    3133VR0
    3234
    33 $config{'vr1'}=sprintf <<VR1;  # Ethernet naar CeTIM2
     35$config{'vr1'}=sprintf <<VR1;
     36COMMENT=Ethernet naar CeTIM2
    3437TYPE=ethernet
    3538IP=172.16.0.33/30                                                       
     
    3942VR1
    4043                                                                               
    41 $config{'vr2'}=sprintf <<VR2;  # a-link Nanostation5 Noord-Oost
     44$config{'vr2'}=sprintf <<VR2;
     45COMMENT=a-link Nanostation5 Noord-Oost
    4246TYPE=ethernet
    4347EXTRA_TYPE=eth2wifibridge
     
    4650SDESC=NScetim1-n
    4751DHCP=no
    48 #ESSID=il-no.cetim1.wleiden.net
    49 #CHANNEL=140
     52ESSID=il-no.cetim1.wleiden.net
     53CHANNEL=140
    5054#mode 11a bridge master
    5155VR2
    5256
    53 $config{'vr2:0'}=sprintf <<VR20;  # a-link Houtmarkt
     57$config{'vr2:0'}=sprintf <<VR20;
     58COMMENT=a-link Houtmarkt
    5459TYPE=ethernet
    5560EXTRA_TYPE=eth2wifibridge
     
    5964VR20
    6065
    61 $config{'vr2:1'}=sprintf <<VR21;  # a-link Spoortje
     66$config{'vr2:1'}=sprintf <<VR21;
     67COMMENT=a-link Spoortje
    6268TYPE=ethernet
    6369EXTRA_TYPE=eth2wifibridge
     
    6773VR21
    6874   
    69 $config{'ue0'}=sprintf <<UE0;  # a-link Nanostation5 Zuid-Oost
     75$config{'ue0'}=sprintf <<UE0;
     76COMMENT=a-link Nanostation5 Zuid-Oost
    7077TYPE=ethernet
    7178EXTRA_TYPE=eth2wifibridge
     
    7481SDESC=2roomburgh1
    7582DHCP=no
    76 #ESSID=il-zo.cetim1.wleiden.net
    77 #CHANNEL=132
     83ESSID=il-zo.cetim1.wleiden.net
     84CHANNEL=132
    7885#mode 11a bridge master                                                                       
    7986UE0
  • nodes/CNodeCeTIM2/wleiden.conf

    r8260 r8261  
    1111$Y='463704';
    1212
    13 $config{'ath0'}=sprintf <<ATH0;  # APs Z+W
     13$config{'ath0'}=sprintf <<ATH0;
     14COMMENT=APs Z+W
    1415TYPE=wireless
    1516IP=$master_ip/26
     
    2223ATH0
    2324
    24 $config{'ath0:1'}=sprintf <<ATH01;  # link naar Burcht
     25$config{'ath0:1'}=sprintf <<ATH01;
     26COMMENT=link naar Burcht
    2527TYPE=wireless
    2628IP=172.16.0.105/30
     
    3032ATH01
    3133
    32 $config{'vr0'}=sprintf <<VR0;  # Ethernet naar CeTIM1
     34$config{'vr0'}=sprintf <<VR0;
     35COMMENT=Ethernet naar CeTIM1
    3336TYPE=ethernet
    3437IP=172.16.0.34/30
     
    3841VR0
    3942
    40 $config{'vr1'}=sprintf <<VR1;  # a-link Nanostation5 Noord-West
     43$config{'vr1'}=sprintf <<VR1;
     44COMMENT=a-link Nanostation5 Noord-West
    4145TYPE=ethernet
    4246EXTRA_TYPE=eth2wifibridge
     
    4549SDESC=2lvln
    4650DHCP=no
    47 #ESSID=il-nw.cetim2.wleiden.net
    48 #CHANNEL=124
     51ESSID=il-nw.cetim2.wleiden.net
     52CHANNEL=124
    4953#mode 11a bridge master                                                                       
    5054VR1
    5155
    52 $config{'vr1:1'}=sprintf <<VR11;  # link naar OB
     56$config{'vr1:1'}=sprintf <<VR11;
     57COMMENT=link naar OB
    5358TYPE=ethernet
    5459IP=172.16.0.161/30
     
    5863VR11
    5964
    60 $config{'vr1:2'}=sprintf <<VR12;  # link naar Rund
     65$config{'vr1:2'}=sprintf <<VR12;
     66COMMENT=link naar Rund
    6167TYPE=ethernet
    6268IP=172.16.0.181/30
     
    6672VR12
    6773
    68 $config{'vr2'}=sprintf <<VR2;  #Interlinks ZW
     74$config{'vr2'}=sprintf <<VR2;
     75COMMENT=Interlinks ZW
    6976TYPE=ethernet
    7077EXTRA_TYPE=eth2wifibridge
     
    7380SDESC=2imi
    7481DHCP=no
    75 #MODE=11a bridge master
    76 #ESSID=il-zw.cetim2.wleiden.net
    77 #CHANNEL=116
     82MODE=11a bridge master
     83ESSID=il-zw.cetim2.wleiden.net
     84CHANNEL=116
    7885VR2
    7986
    80 $config{'vr2:0'}=sprintf <<VR20;  # link naar Huub
     87$config{'vr2:0'}=sprintf <<VR20;
     88COMMENT=link naar Huub
    8189TYPE=ethernet
    8290IP=172.16.4.25/29
     
    8694VR20
    8795
    88 $config{'ue0'}=sprintf <<UEO;  # Ethernet naar lokaal AP
     96$config{'ue0'}=sprintf <<UEO;
     97COMMENT=Ethernet naar lokaal AP
    8998TYPE=ethernet
    9099EXTRA_TYPE=eth2wifibridge
     
    93102SDESC=lokaalAP
    94103DHCP=10-250
    95 #ESSID=ap-WirelessLeiden-HooglandseKerk
    96 #CHANNEL=6
    97 #MODE 11b bridge master
     104ESSID=ap-WirelessLeiden-HooglandseKerk
     105CHANNEL=6
     106MODE 11b bridge master
    98107UEO
    99108
  • nodes/CNodeCope/wleiden.conf

    r8105 r8261  
    1010$Y='463889';
    1111
    12 $config{'ue0'}=sprintf <<UE0;  # link naar proxy1
     12$config{'ue0'}=sprintf <<UE0;
     13COMMENT=link naar proxy1
    1314TYPE=ethernet
    1415IP=172.17.8.66/28
     
    1718UE0
    1819
    19 $config{'ath0'}=sprintf <<ATH0;  # OMNI
     20$config{'ath0'}=sprintf <<ATH0;
     21COMMENT=OMNI
    2022TYPE=wireless
    2123IP=$master_ip/26
     
    3638ATH00
    3739
    38 $config{'vr0'}=sprintf <<VR0; # a-link naar Unigor via NS5
     40$config{'vr0'}=sprintf <<VR0;
     41COMMENT=a-link naar Unigor via NS5
    3942TYPE=ethernet
    4043EXTRA_TYPE=eth2wifibridge
     
    4245DESC=Ethernet to interlink UniGor
    4346SDESC=2unigor
    44 #Default IP 192.168.1.20 for NS5 management
    45 #MODE=11a bridge station
    46 #ESSID=il-zo.unigor.wleiden.net
    47 #CHANNEL=
    48 #NS_IP=192.168.1.21
    49 #NSMAC=00:15:6D:EA:F0:1D
     47Default IP 192.168.1.20 for NS5 management
     48MODE=11a bridge station
     49ESSID=il-zo.unigor.wleiden.net
     50CHANNEL=
     51NS_IP=192.168.1.21
     52NSMAC=00:15:6D:EA:F0:1D
    5053VR0
    5154
    52 $config{'vr1'}=sprintf <<VR1; # a-link naar Stadhuis  via NS5
     55$config{'vr1'}=sprintf <<VR1;
     56COMMENT=a-link naar Stadhuis  via NS5
    5357TYPE=ethernet
    5458EXTRA_TYPE=eth2wifibridge
     
    5660DESC=Link naar Stadhuis
    5761SDESC=2stadhuis
    58 #Default IP 192.168.1.20 for NS5 management
    59 #MODE=11a bridge managed
    60 #ESSID=il-nw.stadhuis.wleiden.net
    61 #CHANNEL=116
    62 #NS_IP=192.168.1.21
    63 #NSMAC=00:15:6D:EA:F0:4C
     62Default IP 192.168.1.20 for NS5 management
     63MODE=11a bridge managed
     64ESSID=il-nw.stadhuis.wleiden.net
     65CHANNEL=116
     66NS_IP=192.168.1.21
     67NSMAC=00:15:6D:EA:F0:4C
    6468VR1
    6569
    66 $config{'vr2'}=sprintf <<VR2; # a-link naar Rabo via NS5
     70$config{'vr2'}=sprintf <<VR2;
     71COMMENT=a-link naar Rabo via NS5
    6772TYPE=ethernet
    6873EXTRA_TYPE=eth2wifibridge
     
    7075DESC=ethernet to interlink
    7176SDESC=2rabo
    72 #Default IP 192.168.1.20 for NS5 management
    73 #MODE=managed
    74 #ESSID=il-z.rabo.wleiden.net
    75 #CHANNEL=44
    76 #NSMAC=00:15:6D:EA:F0:0F
     77Default IP 192.168.1.20 for NS5 management
     78MODE=managed
     79ESSID=il-z.rabo.wleiden.net
     80CHANNEL=44
     81NSMAC=00:15:6D:EA:F0:0F
    7782VR2
  • nodes/CNodeDeClercq/wleiden.conf

    r8260 r8261  
    99$Y='462845';
    1010
    11 $config{'ath0'}=sprintf <<ATH0;  # Ap voor buurt
     11$config{'ath0'}=sprintf <<ATH0;
     12COMMENT=Ap voor buurt
    1213TYPE=wireless
    1314IP=$master_ip/26
     
    2122ATH0
    2223
    23 $config{'vr0'}=sprintf <<VR0;  # ethernet to local subnet with PoE
     24$config{'vr0'}=sprintf <<VR0;
     25COMMENT=ethernet to local subnet with PoE
    2426TYPE=ethernet
    2527IP=172.16.4.53/30
     
    3032VR0
    3133
    32 $config{'vr1'}=sprintf <<VR1; # a-link to Roomburgh3 via Nanostation5
     34$config{'vr1'}=sprintf <<VR1;
     35COMMENT=a-link to Roomburgh3 via Nanostation5
    3336TYPE=ethernet
    3437EXTRA_TYPE=eth2wifibridge
     
    3639DESC=Ethernet to interlink west (Roomburgh3)
    3740SDESC=2roomburgh3
    38 #MODE=master
    39 #ESSID=il-w.declercq.wleiden.net
    40 #CHANNEL=52
    41 #NSMAC=00:15:6D:EA:F0:70
     41MODE=master
     42ESSID=il-w.declercq.wleiden.net
     43CHANNEL=52
     44NSMAC=00:15:6D:EA:F0:70
    4245VR1
    4346
    44 $config{'vr2'}=sprintf <<VR2; # a-link to Leythenrode  via Nanostation5
     47$config{'vr2'}=sprintf <<VR2;
     48COMMENT=a-link to Leythenrode  via Nanostation5
    4549TYPE=ethernet
    4650EXTRA_TYPE=eth2wifibridge
     
    4852DESC=ethernet to interlink north-east
    4953SDESC=2leythenrode
    50 #MODE=managed
    51 #ESSID=il-zw.leythenrode.wleiden.net
    52 #CHANNEL=44
    53 #NSMAC=00:15:6D:EA:F0:7B
     54MODE=managed
     55ESSID=il-zw.leythenrode.wleiden.net
     56CHANNEL=44
     57NSMAC=00:15:6D:EA:F0:7B
    5458VR2
    5559
    56 $config{'ue0'}=sprintf <<UE0; # a-link to Stadhuis  via Nanostation5
     60$config{'ue0'}=sprintf <<UE0;
     61COMMENT=a-link to Stadhuis  via Nanostation5
    5762TYPE=ethernet
    5863EXTRA_TYPE=eth2wifibridge
     
    6065DESC=ethernet to interlink
    6166SDESC=2stadhuis
    62 #MODE=managed
    63 #ESSID=il-o.stadhuis.wleiden.net
    64 #CHANNEL=36
    65 #NSMAC=00:15:6D:EA:F0:63
     67MODE=managed
     68ESSID=il-o.stadhuis.wleiden.net
     69CHANNEL=36
     70NSMAC=00:15:6D:EA:F0:63
    6671UE0
    6772
  • nodes/CNodeDirkLos1/wleiden.conf

    r8237 r8261  
    1818MODE=managed
    1919ESSID=n-o.unigor.wleiden.net
    20 #CHANNEL=1
     20CHANNEL=1
    2121ATH0
    2222
    23 $config{'vr0'}=sprintf <<VR0; # a-link naar geluidsnet1
     23$config{'vr0'}=sprintf <<VR0;
     24COMMENT=a-link naar geluidsnet1
    2425TYPE=ethernet
    2526EXTRA_TYPE=eth2wifibridge
     
    2829SDESC=2geluidsnet1
    2930DHCP=no
    30 #MODE=ap
    31 #ESSID=il-zw.geluidsnet1.wleiden.net
    32 #CHANNEL=140
    33 #NSMAC=00:15:6D:F6:BE:FF
    34 #NSIP=172.16.4.155/29
     31MODE=ap
     32ESSID=il-zw.geluidsnet1.wleiden.net
     33CHANNEL=140
     34NSMAC=00:15:6D:F6:BE:FF
     35NSIP=172.16.4.155/29
    3536VR0
    3637
    37 $config{'vr1'}=sprintf <<VR1; # a-link to Vosko3
     38$config{'vr1'}=sprintf <<VR1;
     39COMMENT=a-link to Vosko3
    3840TYPE=ethernet
    3941EXTRA_TYPE=eth2wifibridge
     
    4244SDESC=2Vosko3
    4345DHCP=no
    44 #MODE=station
    45 #ESSID=il-wnw.vosko3.wleiden.net
    46 #CHANNEL=100
    47 #NSMAC=00:15:6D:F6:BE:EB
    48 #NSIP=172.16.4.75/29
     46MODE=station
     47ESSID=il-wnw.vosko3.wleiden.net
     48CHANNEL=100
     49NSMAC=00:15:6D:F6:BE:EB
     50NSIP=172.16.4.75/29
    4951VR1
    5052
    51 $config{'vr2'}=sprintf <<VR2; # a-link naar Cam
     53$config{'vr2'}=sprintf <<VR2;
     54COMMENT=a-link naar Cam
    5255TYPE=ethernet
    5356EXTRA_TYPE=eth2wifibridge
     
    5659SDESC=2cam
    5760DHCP=no
    58 #MODE=ap
    59 #ESSID=il-zw.dirklos1.wleiden.net
    60 #CHANNEL=44
    61 #NSMAC=00:15:6D:70:53:52
    62 #NSIP=172.16.4.90/29
     61MODE=ap
     62ESSID=il-zw.dirklos1.wleiden.net
     63CHANNEL=44
     64NSMAC=00:15:6D:70:53:52
     65NSIP=172.16.4.90/29
    6366VR2
    6467
    65 $config{'ue0'}=sprintf <<UE0;  # lokaal ethernet via switch in voedingskast met PoE
     68$config{'ue0'}=sprintf <<UE0;
     69COMMENT=lokaal ethernet via switch in voedingskast met PoE
    6670TYPE=ethernet
    6771IP=172.16.3.58/30
     
    7175UE0
    7276
    73 $config{'ue0:0'}=sprintf <<UE00;  # alias voor lokaal ethernet naar DirkLos2
     77$config{'ue0:0'}=sprintf <<UE00;
     78COMMENT=alias voor lokaal ethernet naar DirkLos2
    7479TYPE=ethernet
    7580IP=172.16.176.66/27
  • nodes/CNodeDirkLos2/wleiden.conf

    r8181 r8261  
    1010$Y='464748';
    1111
    12 $config{'ath0'}=sprintf <<AT0;  # Ap voor buurt
     12$config{'ath0'}=sprintf <<AT0;
     13COMMENT=Ap voor buurt
    1314TYPE=wireless
    1415IP=$master_ip/26
     
    2122AT0
    2223
    23 $config{'vr0'}=sprintf <<VR0; # interlink west (unigor)
     24$config{'vr0'}=sprintf <<VR0;
     25COMMENT=interlink west (unigor)
    2426TYPE=ethernet
    2527EXTRA_TYPE=eth2wifibridge
     
    2830SDESC=2Unigor
    2931DHCP=no
    30 #MODE=station
    31 #ESSID=il-o.unigor.wleiden.net
    32 #CHANNEL=52
     32MODE=station
     33ESSID=il-o.unigor.wleiden.net
     34CHANNEL=52
    3335VR0
    3436
    35 $config{'vr1'}=sprintf <<VR1; # interlink noord-oost Rabo2
     37$config{'vr1'}=sprintf <<VR1;
     38COMMENT=interlink noord-oost Rabo2
    3639TYPE=ethernet
    3740EXTRA_TYPE=eth2wifibridge
     
    4043SDESC=2Rabo2
    4144DHCP=no
    42 #MODE=master
    43 #ESSID=il-no.dirklos2.wleiden.net
    44 #CHANNEL=140
     45MODE=master
     46ESSID=il-no.dirklos2.wleiden.net
     47CHANNEL=140
    4548VR1
    4649
    47 $config{'vr2'}=sprintf <<VR2; # interlink zuid-oost (stadhuis2)
     50$config{'vr2'}=sprintf <<VR2;
     51COMMENT=interlink zuid-oost (stadhuis2)
    4852TYPE=ethernet
    4953EXTRA_TYPE=eth2wifibridge
     
    5256SDESC=2Stadhuis
    5357DHCP=no
    54 #MODE=managed
    55 #ESSID=il-nw.stadhuis2.wleiden.net
    56 #CHANNEL=36
     58MODE=managed
     59ESSID=il-nw.stadhuis2.wleiden.net
     60CHANNEL=36
    5761VR2
    5862
     
    6569VR20
    6670
    67 $config{'ue0'}=sprintf <<UE0;  # lokaal ethernet via switch in voedingskast met PoE
     71$config{'ue0'}=sprintf <<UE0;
     72COMMENT=lokaal ethernet via switch in voedingskast met PoE
    6873TYPE=ethernet
    6974IP=172.16.3.57/30
     
    7378UE0
    7479
    75 $config{'ue0:0'}=sprintf <<UE00;  # alias voor lokaal ethernet naar DirkLos1
     80$config{'ue0:0'}=sprintf <<UE00;
     81COMMENT=alias voor lokaal ethernet naar DirkLos1
    7682TYPE=ethernet
    7783IP=172.16.176.65/27
  • nodes/CNodeGeluidsnet1/wleiden.conf

    r8238 r8261  
    1212$LAT='52.164';
    1313
    14 $config{'ath0'}=sprintf <<ATH0;  # ap
     14$config{'ath0'}=sprintf <<ATH0;
     15COMMENT=ap
    1516TYPE=wireless
    1617IP=$master_ip/26
     
    2324ATH0
    2425
    25 $config{'vr0'}=sprintf <<VR0;  # Link naar Geluidsnet2
     26$config{'vr0'}=sprintf <<VR0;
     27COMMENT=Link naar Geluidsnet2
    2628TYPE=ethernet
    2729IP=172.16.4.185/30
     
    3133VR0
    3234
    33 $config{'vr1'}=sprintf <<VR1;  # Link naar Lebkov
     35$config{'vr1'}=sprintf <<VR1;
     36COMMENT=Link naar Lebkov
    3437TYPE=ethernet
    3538EXTRA_TYPE=eth2wifibridge
     
    3841SDESC=2lebkov
    3942DHCP=no
    40 #MODE=master wds
    41 #ESSID=il-n.geluidsnet1.wleiden.net
    42 #CHANNEL=36
    43 #NSMAC=00:15:6D:EC:81:7B
    44 #NS_IP=172.16.4.162/29
     43MODE=master wds
     44ESSID=il-n.geluidsnet1.wleiden.net
     45CHANNEL=36
     46NSMAC=00:15:6D:EC:81:7B
     47NS_IP=172.16.4.162/29
    4548VR1
    4649
    47 $config{'vr2'}=sprintf <<VR2;  # Link naar DirkLos1
     50$config{'vr2'}=sprintf <<VR2;
     51COMMENT=Link naar DirkLos1
    4852TYPE=ethernet
    4953EXTRA_TYPE=eth2wifibridge
     
    5256SDESC=2dirklos1
    5357DHCP=no
    54 #MODE=master wds
    55 #ESSID=il-zw.geluidsnet1.wleiden.net
    56 #CHANNEL=140
    57 #NSMAC=00:15:6D:EC:82:8C
    58 #NS_IP=172.16.4.154/29
     58MODE=master wds
     59ESSID=il-zw.geluidsnet1.wleiden.net
     60CHANNEL=140
     61NSMAC=00:15:6D:EC:82:8C
     62NS_IP=172.16.4.154/29
    5963VR2
    6064
    61 $config{'ue0'}=sprintf <<UE0;  # Link naar Webcam
     65$config{'ue0'}=sprintf <<UE0;
     66COMMENT=Link naar Webcam
    6267TYPE=ethernet
    6368IP=172.16.16.1/30
     
    6772UE0
    6873
    69 $config{'ue1'}=sprintf <<UE1;  # Link naar XXX
     74$config{'ue1'}=sprintf <<UE1;
     75COMMENT=Link naar XXX
    7076TYPE=ethernet
    7177EXTRA_TYPE=eth2wifibridge
     
    7379DESC=b-link naar XXX
    7480SDESC=2xxx-ue1
    75 #MODE=XXX
    76 #ESSID=XX-XX.XXX.wleiden.net
    77 #CHANNEL=XX
    78 #NSMAC=
    79 #NS_IP=172.16.4.170/29
     81MODE=XXX
     82ESSID=XX-XX.XXX.wleiden.net
     83CHANNEL=XX
     84NSMAC=
     85NS_IP=172.16.4.170/29
    8086DHCP=no
    8187UE1
  • nodes/CNodeGeluidsnet2/wleiden.conf

    r8234 r8261  
    1212$LAT='52.163';
    1313
    14 $config{'ath0'}=sprintf <<ATH0;  # ap
     14$config{'ath0'}=sprintf <<ATH0;
     15COMMENT=ap
    1516TYPE=wireless
    1617IP=$master_ip/26
     
    2324ATH0
    2425
    25 $config{'vr0'}=sprintf <<VR0;  # Link naar Geluidsnet1
     26$config{'vr0'}=sprintf <<VR0;
     27COMMENT=Link naar Geluidsnet1
    2628TYPE=ethernet
    2729EXTRA_TYPE=eth2wifibridge
     
    3234VR0
    3335
    34 $config{'vr1'}=sprintf <<VR1;  # Link naar XXX
     36$config{'vr1'}=sprintf <<VR1;
     37COMMENT=Link naar XXX
    3538TYPE=ethernet
    3639EXTRA_TYPE=eth2wifibridge
     
    3841DESC=Link naar XXX
    3942SDESC=2xxx-vr1
    40 #MODE=master wds
    41 #ESSID=il-z.geluidsnet2.wleiden.net
    42 #CHANNEL=132
    43 #NSMAC= 00:15:6D:70:4D:6A
    44 #NS_IP=172.16.4.194/29
     43MODE=master wds
     44ESSID=il-z.geluidsnet2.wleiden.net
     45CHANNEL=132
     46NSMAC= 00:15:6D:70:4D:6A
     47NS_IP=172.16.4.194/29
    4548VR1
    4649
    47 $config{'vr2'}=sprintf <<VR2;  # Link naar vosko3
     50$config{'vr2'}=sprintf <<VR2;
     51COMMENT=Link naar vosko3
    4852TYPE=ethernet
    4953EXTRA_TYPE=eth2wifibridge
     
    5256SDESC=2vosko3
    5357DHCP=no
    54 #MODE=station wds
    55 #ESSID=il-wnw.vosko3.wleiden.net
    56 #CHANNEL=100
    57 #NSMAC= 00:15:6D:EC:82:96
    58 #NS_IP=172.16.4.203/29
     58MODE=station wds
     59ESSID=il-wnw.vosko3.wleiden.net
     60CHANNEL=100
     61NSMAC= 00:15:6D:EC:82:96
     62NS_IP=172.16.4.203/29
    5963VR2
    6064
    61 $config{'ue0'}=sprintf <<UE0;  # Link naar XXX
     65$config{'ue0'}=sprintf <<UE0;
     66COMMENT=Link naar XXX
    6267TYPE=ethernet
    6368IP=172.16.4.209/29
    6469DESC=Link naar XXX
    6570SDESC=2xxx-ue0
    66 #MODE=master wds
    67 #ESSID=il-o.geluidsnet2.wleiden.net
    68 #CHANNEL=64
    69 #NSMAC=00:15:6D:70:4D:A3
    70 #NS_IP=172.16.4.210/29
     71MODE=master wds
     72ESSID=il-o.geluidsnet2.wleiden.net
     73CHANNEL=64
     74NSMAC=00:15:6D:70:4D:A3
     75NS_IP=172.16.4.210/29
    7176DHCP=no
    7277UE0
    7378
    74 $config{'ue1'}=sprintf <<UE1;  # Link naar XXX
     79$config{'ue1'}=sprintf <<UE1;
     80COMMENT=Link naar XXX
    7581TYPE=ethernet
    7682EXTRA_TYPE=eth2wifibridge
     
    7884DESC=b-link naar XXX
    7985SDESC=2xxx-ue1
    80 #MODE=XXX
    81 #ESSID=XX-XX.XXX.wleiden.net
    82 #CHANNEL=XX
    83 #NSMAC=
    84 #NS_IP=172.16.4.218/29
     86MODE=XXX
     87ESSID=XX-XX.XXX.wleiden.net
     88CHANNEL=XX
     89NSMAC=
     90NS_IP=172.16.4.218/29
    8591DHCP=no
    8692UE1
  • nodes/CNodeGraficall/wleiden.conf

    r8139 r8261  
    1010$Y='463425';
    1111
    12 $config{'ath0'}=sprintf <<ATH0;  # omni
     12$config{'ath0'}=sprintf <<ATH0;
     13COMMENT=omni
    1314TYPE=wireless
    1415IP=$master_ip/26
     
    2122ATH0
    2223
    23 $config{'ue0'}=sprintf <<UE0;  # b-link to Hoogmade via Bullet2
     24$config{'ue0'}=sprintf <<UE0;
     25COMMENT=b-link to Hoogmade via Bullet2
    2426TYPE=ethernet
    2527EXTRA_TYPE=eth2wifibridge
     
    2729DESC=Link naar HMKerk2
    2830SDESC=2hmkerk2
    29 #MODE=master
    30 #ESSID=il-n.graficall.wleiden.net
    31 #CHANNEL=5
     31MODE=master
     32ESSID=il-n.graficall.wleiden.net
     33CHANNEL=5
    3234HEIGHT=17
    3335DHCP=no
     
    4244UE00
    4345
    44 $config{'vr0'}=sprintf <<VR0; # a-link to Leythenrode via Nanostation5
     46$config{'vr0'}=sprintf <<VR0;
     47COMMENT=a-link to Leythenrode via Nanostation5
    4548TYPE=ethernet
    4649EXTRA_TYPE=eth2wifibridge
     
    4952SDESC=2Leythenrode
    5053DHCP=no
    51 #MODE=managed bridge
    52 #ESSID=il-no.leythenrode.wleiden.net
    53 #CHANNEL=52
    54 #NSMAC=00:15:6D:EA:F0:4C
    55 #NS_IP=192.168.1.21
     54MODE=managed bridge
     55ESSID=il-no.leythenrode.wleiden.net
     56CHANNEL=52
     57NSMAC=00:15:6D:EA:F0:4C
     58NS_IP=192.168.1.21
    5659VR0
    5760
     
    6366SDESC=2jvc
    6467DHCP=no
    65 #MODE=11a bridge ap
    66 #ESSID=il-zw.graficall.wleiden.net
    67 #CHANNEL=36
    68 #NSMAC=00:15:6D:EA:F0:68
    69 #NS_IP=192.168.1.20
     68MODE=11a bridge ap
     69ESSID=il-zw.graficall.wleiden.net
     70CHANNEL=36
     71NSMAC=00:15:6D:EA:F0:68
     72NS_IP=192.168.1.20
    7073VR1
    7174
     
    7780SDESC=2som
    7881DHCP=no
    79 #MODE=11a bridge ap
    80 #ESSID=il-nw.graficall.wleiden.net
    81 #CHANNEL=60
    82 #NSMAC= 00:15:6D:EB:F0:F8
     82MODE=11a bridge ap
     83ESSID=il-nw.graficall.wleiden.net
     84CHANNEL=60
     85NSMAC= 00:15:6D:EB:F0:F8
    8386VR2
  • nodes/CNodeGrip/wleiden.conf

    r7657 r8261  
    2121
    2222
    23 $config{'wi0'}=sprintf <<EW0;  # omni
     23$config{'wi0'}=sprintf <<EW0;
     24COMMENT=omni
    2425TYPE=wireless
    2526IP=$master_ip/26
     
    3839EW0
    3940
    40 $config{'wi1'}=sprintf <<EW1;  # link naar IMI
     41$config{'wi1'}=sprintf <<EW1;
     42COMMENT=link naar IMI
    4143TYPE=wireless
    4244IP=172.16.0.250/30
     
    5355EW1
    5456
    55 $config{'wi2'}=sprintf <<EW2;  # Link naar ROCl
     57$config{'wi2'}=sprintf <<EW2;
     58COMMENT=Link naar ROCl
    5659TYPE=wireless
    5760IP=172.16.0.254/30
     
    7275
    7376
    74 $config{'wi3'}=sprintf <<EW3;  # link naar LCPL
     77$config{'wi3'}=sprintf <<EW3;
     78COMMENT=link naar LCPL
    7579TYPE=wireless
    7680IP=172.16.1.1/30
  • nodes/CNodeHMKerk1/wleiden.conf

    r7657 r8261  
    1919$AGGREGATE=22;
    2020
    21 $config{'sis0'}=sprintf <<ED0;  # eth port 0 hmkerk1
     21$config{'sis0'}=sprintf <<ED0;
     22COMMENT=eth port 0 hmkerk1
    2223TYPE=ethernet
    2324IP=172.25.60.65/29
     
    3132ED0
    3233
    33 $config{'sis1'}=sprintf <<ED0;  # ethernet port 2 kerk2
     34$config{'sis1'}=sprintf <<ED0;
     35COMMENT=ethernet port 2 kerk2
    3436TYPE=ethernet
    3537IP=172.16.1.141/30
     
    4547
    4648
    47 $config{'wi0'}=sprintf <<EW0;  # OMNI voor de buurt ap-omni.hmkerk
     49$config{'wi0'}=sprintf <<EW0;
     50COMMENT=OMNI voor de buurt ap-omni.hmkerk
    4851TYPE=wireless
    4952IP=$master_ip/26
     
    6366
    6467
    65 $config{'wi1'}=sprintf <<EW1;  # link naar Woubrugge WBrotary
     68$config{'wi1'}=sprintf <<EW1;
     69COMMENT=link naar Woubrugge WBrotary
    6670TYPE=wireless
    6771IP=172.16.2.28/30
  • nodes/CNodeHMKerk2/wleiden.conf

    r7657 r8261  
    1818$AGGREGATE=22;
    1919
    20 $config{'sis0'}=sprintf <<ED0;  # eth port 0 HMkerk2
     20$config{'sis0'}=sprintf <<ED0;
     21COMMENT=eth port 0 HMkerk2
    2122TYPE=ethernet
    2223IP=172.25.64.65/29
     
    3031ED0
    3132
    32 $config{'sis1'}=sprintf <<ED1;  # eth port 1 naar HMkerk1
     33$config{'sis1'}=sprintf <<ED1;
     34COMMENT=eth port 1 naar HMkerk1
    3335TYPE=ethernet
    3436IP=172.16.1.142/30
     
    4345ED1
    4446
    45 $config{'wi0'}=sprintf <<EW0;  # link naar Graficall Wireless Leiden
     47$config{'wi0'}=sprintf <<EW0;
     48COMMENT=link naar Graficall Wireless Leiden
    4649TYPE=wireless
    4750IP=172.16.0.86/30
     
    5861EW0
    5962
    60 $config{'wi1'}=sprintf <<EW1;  # link naar Struyk Verwo Leimuiden.
     63$config{'wi1'}=sprintf <<EW1;
     64COMMENT=link naar Struyk Verwo Leimuiden.
    6165TYPE=wireless
    6266IP=172.16.1.185/30
     
    7377EW1
    7478
    75 $config{'wi1:0'}=sprintf <<EW10;  # link naar HMgw2.
     79$config{'wi1:0'}=sprintf <<EW10;
     80COMMENT=link naar HMgw2.
    7681TYPE=wireless
    7782IP=172.16.2.89/30
  • nodes/CNodeHaagwijk/wleiden.conf

    r8220 r8261  
    1010$Y='461987';
    1111
    12 $config{'ath0'}=sprintf <<ATH0;  # ap
     12$config{'ath0'}=sprintf <<ATH0;
     13COMMENT=ap
    1314TYPE=wireless
    1415IP=$master_ip/26
     
    2122ATH0
    2223
    23 $config{'vr0'}=sprintf <<VR0;  # Link naar ROC
     24$config{'vr0'}=sprintf <<VR0;
     25COMMENT=Link naar ROC
    2426TYPE=ethernet
    2527EXTRA_TYPE=eth2wifibridge
     
    2830DESC=Link naar ROCl
    2931SDESC=2rocl
    30 #MODE=master
    31 #ESSID=il-o.haagwijk.wleiden.net
    32 #CHANNEL=140
    33 #NSMAC=
     32MODE=master
     33ESSID=il-o.haagwijk.wleiden.net
     34CHANNEL=140
     35NSMAC=
    3436VR0
    3537
    36 $config{'vr1'}=sprintf <<VR1;  # Nanostation5 naar LivingLab
     38$config{'vr1'}=sprintf <<VR1;
     39COMMENT=Nanostation5 naar LivingLab
    3740TYPE=ethernet
    3841EXTRA_TYPE=eth2wifibridge
     
    4144SDESC=2livinglab
    4245DHCP=no
    43 #MODE=bridge managed
    44 #ESSID=il-zo.livinglab.wleiden.net
    45 #CHANNEL=36
    46 #NSMAC=
     46MODE=bridge managed
     47ESSID=il-zo.livinglab.wleiden.net
     48CHANNEL=36
     49NSMAC=
    4750VR1
    4851
    49 $config{'vr2'}=sprintf <<VR2;  # Link naar AJsoft
     52$config{'vr2'}=sprintf <<VR2;
     53COMMENT=Link naar AJsoft
    5054TYPE=ethernet
    5155EXTRA_TYPE=eth2wifibridge
     
    5458SDESC=2ajsoft
    5559DHCP=no
    56 #MODE=bridge ap
    57 #ESSID=il-nw.haagwijk.wleiden.net
    58 #CHANNEL=52
    59 #NSMAC=00:15:6d:ea:f0:f6
    60 #NS_IP=192.168.1.20
     60MODE=bridge ap
     61ESSID=il-nw.haagwijk.wleiden.net
     62CHANNEL=52
     63NSMAC=00:15:6d:ea:f0:f6
     64NS_IP=192.168.1.20
    6165VR2
    6266
    63 $config{'ue0'}=sprintf <<UE0;  # Link naar Rick
     67$config{'ue0'}=sprintf <<UE0;
     68COMMENT=Link naar Rick
    6469TYPE=ethernet
    6570IP=172.16.4.145/29
    6671DESC=a-link naar Rick
    6772SDESC=2rick
    68 #MODE=bridge ap
    69 #ESSID=il-zw.haagwijk.wleiden.net
    70 #CHANNEL=40
    71 #NSMAC=
    72 #NS_IP=172.16.4.146/29
     73MODE=bridge ap
     74ESSID=il-zw.haagwijk.wleiden.net
     75CHANNEL=40
     76NSMAC=
     77NS_IP=172.16.4.146/29
    7378DHCP=no
    7479UE0
    7580
    76 $config{'ue1'}=sprintf <<UE1;  # Link naar LCPL
     81$config{'ue1'}=sprintf <<UE1;
     82COMMENT=Link naar LCPL
    7783TYPE=ethernet
    7884EXTRA_TYPE=eth2wifibridge
     
    8086DESC=b-link naar LCPL
    8187SDESC=2lcpl
    82 #MODE=bridge ap
    83 #ESSID=il-o.haagwijk.wleiden.net
    84 #CHANNEL=1
     88MODE=bridge ap
     89ESSID=il-o.haagwijk.wleiden.net
     90CHANNEL=1
    8591DHCP=no
    8692UE1
    8793
    88 $config{'ue1:1'}=sprintf <<UE11;  # Link naar Lorentzhof
     94$config{'ue1:1'}=sprintf <<UE11;
     95COMMENT=Link naar Lorentzhof
    8996TYPE=wireless
    9097IP=172.16.1.230/30
  • nodes/CNodeHans/wleiden.conf

    r7657 r8261  
    1818$Y='460430';
    1919
    20 $config{'xl0'}=sprintf <<ED0;  # Local ethernet
     20$config{'xl0'}=sprintf <<ED0;
     21COMMENT=Local ethernet
    2122
    2223TYPE=ethernet
     
    2526DESC=Ethernet lokaal
    2627SDESC=eth0
    27 #DHCP=68-70
     28DHCP=68-70
    2829DHCP=no
    2930
     
    4647EW0
    4748
    48 $config{'wi1'}=sprintf <<EW1;  # Link naar AA24
     49$config{'wi1'}=sprintf <<EW1;
     50COMMENT=Link naar AA24
    4951TYPE=wireless
    5052IP=172.16.2.41/30
     
    6567EW1
    6668
    67 $config{'wi2'}=sprintf <<EW2;  # link naar Gerard
     69$config{'wi2'}=sprintf <<EW2;
     70COMMENT=link naar Gerard
    6871TYPE=wireless
    6972IP=172.16.1.189/30
  • nodes/CNodeHofland/wleiden.conf

    r8136 r8261  
    1010$Y='462384';
    1111
    12 $config{'wi0'}=sprintf <<WI0;  # ap
     12$config{'wi0'}=sprintf <<WI0;
     13COMMENT=ap
    1314TYPE=wireless
    1415IP=$master_ip/26
     
    2122WI0
    2223
    23 $config{'sis0'}=sprintf <<SIS0;  # Ethernet
     24$config{'sis0'}=sprintf <<SIS0;
     25COMMENT=Ethernet
    2426TYPE=ethernet
    2527IP=10.0.0.1/24
     
    2931SIS0
    3032
    31 $config{'sis1'}=sprintf <<SIS1;  # link AJSoft2
     33$config{'sis1'}=sprintf <<SIS1;
     34COMMENT=link AJSoft2
    3235TYPE=ethernet
    3336EXTRA_TYPE=eth2wifibridge
     
    3639SDESC=2ajsoft2
    3740DHCP=no
    38 #MODE=bridge managed
    39 #ESSID=il-w.ajsoft2.wleiden.net
    40 #CHANNEL=100
    41 #NSMAC=00:15:6D:70:53:4A
    42 #NS_IP=192.168.1.21
     41MODE=bridge managed
     42ESSID=il-w.ajsoft2.wleiden.net
     43CHANNEL=100
     44NSMAC=00:15:6D:70:53:4A
     45NS_IP=192.168.1.21
    4346SIS1
    4447
    4548
    46 $config{'wi1'}=sprintf <<WI1;# naar Voorschoten
     49$config{'wi1'}=sprintf <<WI1;
     50COMMENT=naar Voorschoten
    4751TYPE=wireless
    4852IP=172.20.149.1/26
  • nodes/CNodeHofwijck/wleiden.conf

    r8156 r8261  
    1010$Y='466629';
    1111
    12 $config{'ath0'}=sprintf <<ATH0;  # ap voor de buurt
     12$config{'ath0'}=sprintf <<ATH0;
     13COMMENT=ap voor de buurt
    1314TYPE=wireless
    1415IP=$master_ip/26
     
    2122ATH0
    2223
    23 $config{'ue0'}=sprintf <<UE0;  # Ethernet naar Hofwijck
     24$config{'ue0'}=sprintf <<UE0;
     25COMMENT=Ethernet naar Hofwijck
    2426TYPE=ethernet
    2527IP=172.23.16.65/28
     
    2830UE0
    2931
    30 $config{'vr0'}=sprintf <<VR0; # b-Link naar Lange Voort
     32$config{'vr0'}=sprintf <<VR0;
     33COMMENT=b-Link naar Lange Voort
    3134TYPE=ethernet
    3235EXTRA_TYPE=eth2wifibridge
     
    3538SDESC=2langevoort
    3639DHCP=no
    37 #MODE=bridge ap
    38 #ESSID=il-w.hofwijck.wleiden.net
    39 #CHANNEL=3
    40 #Bullet_IP=192.168.1.20
    41 #BulletMAC=00:15:6D:E8:E7:37
     40MODE=bridge ap
     41ESSID=il-w.hofwijck.wleiden.net
     42CHANNEL=3
     43Bullet_IP=192.168.1.20
     44BulletMAC=00:15:6D:E8:E7:37
    4245VR0
    4346
    44 $config{'vr1'}=sprintf <<VR1; # Link naar UniGorN
     47$config{'vr1'}=sprintf <<VR1;
     48COMMENT=Link naar UniGorN
    4549TYPE=ethernet
    4650EXTRA_TYPE=eth2wifibridge
     
    4953SDESC=2unigorn
    5054DHCP=no
    51 #MODE=bridge station
    52 #ESSID=il-o.unigorn.wleiden.net
    53 #CHANNEL=104
    54 #NS_IP=192.168.1.21
    55 #NSMAC=00:15:6D:F6:BE:DB
     55MODE=bridge station
     56ESSID=il-o.unigorn.wleiden.net
     57CHANNEL=104
     58NS_IP=192.168.1.21
     59NSMAC=00:15:6D:F6:BE:DB
    5660VR1
    5761
    58 $config{'vr2'}=sprintf <<VR2; # Link naar Lijtweg1
     62$config{'vr2'}=sprintf <<VR2;
     63COMMENT=Link naar Lijtweg1
    5964TYPE=ethernet
    6065EXTRA_TYPE=eth2wifibridge
     
    6368SDESC=2lijtweg1
    6469DHCP=no
    65 #MODE=bridge station
    66 #ESSID=il-o.lijtweg1.wleiden.net
    67 #CHANNEL=124
    68 #NS_IP=192.168.1.21
    69 #NSMAC=00:15:6D:F6:BE:D0
     70MODE=bridge station
     71ESSID=il-o.lijtweg1.wleiden.net
     72CHANNEL=124
     73NS_IP=192.168.1.21
     74NSMAC=00:15:6D:F6:BE:D0
    7075VR2
    7176
  • nodes/CNodeHoutmarkt/wleiden.conf

    r7657 r8261  
    1919$Y='464299';
    2020
    21 $config{'ep0'}=sprintf <<ED0;  # Ethernet
     21$config{'ep0'}=sprintf <<ED0;
     22COMMENT=Ethernet
    2223TYPE=ethernet
    2324IP=172.19.8.65/28
     
    3435
    3536
    36 $config{'wi0'}=sprintf <<EW;   # Omni
     37$config{'wi0'}=sprintf <<EW;
     38COMMENT=Omni
    3739TYPE=wireless
    3840IP=$master_ip/26
     
    5052EW
    5153
    52 $config{'wi1'}=sprintf <<EW;  # active test AP
     54$config{'wi1'}=sprintf <<EW;
     55COMMENT=active test AP
    5356TYPE=wireless
    5457IP=172.19.8.81/30
     
    6568EW
    6669
    67 $config{'wi2'}=sprintf <<EW;  # link naar Cetim2
     70$config{'wi2'}=sprintf <<EW;
     71COMMENT=link naar Cetim2
    6872TYPE=wireless
    6973IP=172.16.0.42/30
     
    7781ESSID=il-no.cetim2.wleiden.net
    7882
    79 #CHANNEL=10
     83CHANNEL=10
    8084
    8185
     
    8488EW
    8589
    86 $config{'wi3'}=sprintf <<EW;  # link naar Som
     90$config{'wi3'}=sprintf <<EW;
     91COMMENT=link naar Som
    8792TYPE=wireless
    8893IP=172.16.0.50/30
     
    97102MODE=managed
    98103ESSID=il-z.som.wleiden.net
    99 #CHANNEL=5
     104CHANNEL=5
    100105
    101106
  • nodes/CNodeHuub/wleiden.conf

    r8189 r8261  
    1010$Y='463569';
    1111
    12 $config{'ath0'}=sprintf <<AT0;  # Ap
     12$config{'ath0'}=sprintf <<AT0;
     13COMMENT=Ap
    1314TYPE=wireless
    1415IP=$master_ip/26
     
    2122AT0
    2223
    23 $config{'sis0'}=sprintf <<EE0;  # Local ethernet to proxy
     24$config{'sis0'}=sprintf <<EE0;
     25COMMENT=Local ethernet to proxy
    2426TYPE=ethernet
    2527IP=172.17.16.65/30
     
    2931EE0
    3032
    31 $config{'sis1'}=sprintf <<SIS1;  # link naar Rabo1
     33$config{'sis1'}=sprintf <<SIS1;
     34COMMENT=link naar Rabo1
    3235TYPE=ethernet
    3336EXTRA_TYPE=eth2wifibridge
     
    3639SDESC=2rabo1
    3740DHCP=no
    38 #MODE=managed
    39 #ESSID=il-z.rabo.wleiden.net
    40 #CHANNEL=44
    41 #NSMAC=00:15:6D:BD:89:CB
    42 #NSIP=172.16.4.11/29
     41MODE=managed
     42ESSID=il-z.rabo.wleiden.net
     43CHANNEL=44
     44NSMAC=00:15:6D:BD:89:CB
     45NSIP=172.16.4.11/29
    4346SIS1
    4447
    45 $config{'sis2'}=sprintf <<SIS2;  # link naar Cetim2
     48$config{'sis2'}=sprintf <<SIS2;
     49COMMENT=link naar Cetim2
    4650TYPE=ethernet
    4751EXTRA_TYPE=eth2wifibridge
     
    5054SDESC=2cetim2
    5155DHCP=no
    52 #MODE=managed bridge
    53 #ESSID=il-zw.cetim2.wleiden.net
    54 #CHANNEL=
    55 #NSMAC=00:15:6D:F2:39:3D
    56 #NSIP=172.16.4.29/29
     56MODE=managed bridge
     57ESSID=il-zw.cetim2.wleiden.net
     58CHANNEL=
     59NSMAC=00:15:6D:F2:39:3D
     60NSIP=172.16.4.29/29
    5761SIS2
    5862
    59 $config{'sis3'}=sprintf <<SIS3; # link naar Vosko2
     63$config{'sis3'}=sprintf <<SIS3;
     64COMMENT=link naar Vosko2
    6065TYPE=ethernet
    6166EXTRA_TYPE=eth2wifibridge
     
    6469SDESC=2vosko2
    6570DHCP=no
    66 #MODE=managed bridge
    67 #ESSID=il-w.vosko2.wleiden.net
    68 #CHANNEL=64
    69 #NSMAC=00:15:6D:70:54:BA
    70 #NSIP=172.16.4.123/29
     71MODE=managed bridge
     72ESSID=il-w.vosko2.wleiden.net
     73CHANNEL=64
     74NSMAC=00:15:6D:70:54:BA
     75NSIP=172.16.4.123/29
    7176SIS3
    7277
    73 $config{'sis4'}=sprintf <<SIS4; # link naar Stadhuis
     78$config{'sis4'}=sprintf <<SIS4;
     79COMMENT=link naar Stadhuis
    7480TYPE=ethernet
    7581EXTRA_TYPE=eth2wifibridge
     
    7884SDESC=2stadhuis
    7985DHCP=no
    80 #MODE=managed
    81 #ESSID=ap-w.stadhuis.wleiden.net
    82 #CHANNEL=
     86MODE=managed
     87ESSID=ap-w.stadhuis.wleiden.net
     88CHANNEL=
    8389SIS4
    8490
    85 $config{'sis5'}=sprintf <<SIS5; # link to server
     91$config{'sis5'}=sprintf <<SIS5;
     92COMMENT=link to server
    8693TYPE=ethernet
    8794EXTRA_TYPE=eth2wifibridge
  • nodes/CNodeIMI/wleiden.conf

    r7992 r8261  
    1010$Y='463311';
    1111
    12 $config{'ath0'}=sprintf <<ATH0;  # ap
     12$config{'ath0'}=sprintf <<ATH0;
     13COMMENT=ap
    1314TYPE=wireless
    1415IP=$master_ip/26
     
    2122ATH0
    2223
    23 $config{'vr0'}=sprintf <<VR0;  # link naar RijnVliet
     24$config{'vr0'}=sprintf <<VR0;
     25COMMENT=link naar RijnVliet
    2426TYPE=ethernet
    2527EXTRA_TYPE=eth2wifibridge
     
    2830DESC=Link naar rijnvliet
    2931SDESC=2rijnvliet
    30 #MODE=managed
    31 #ESSID=il-no.rv.wleiden.net
    32 #CHANNEL=60
    33 #NSMAC=00:15:6D:
     32MODE=managed
     33ESSID=il-no.rv.wleiden.net
     34CHANNEL=60
     35NSMAC=00:15:6D:
    3436VR0
    3537
    36 $config{'vr1'}=sprintf <<VR1; # link naar CeTIM
     38$config{'vr1'}=sprintf <<VR1;
     39COMMENT=link naar CeTIM
    3740TYPE=ethernet
    3841EXTRA_TYPE=eth2wifibridge
     
    4144DESC=Link naar CeTIM2
    4245SDESC=2cetim2
    43 #MODE=managed
    44 #ESSID=il-zw.cetim2.wleiden.net
    45 #CHANNEL=116
    46 #NSMAC=00:15:6D:
     46MODE=managed
     47ESSID=il-zw.cetim2.wleiden.net
     48CHANNEL=116
     49NSMAC=00:15:6D:
    4750VR1
    4851
    49 $config{'vr2'}=sprintf <<VR2;  # b-link naar Grip
     52$config{'vr2'}=sprintf <<VR2;
     53COMMENT=b-link naar Grip
    5054TYPE=ethernet
    5155EXTRA_TYPE=eth2wifibridge
     
    5458DESC=b-Link naar Grip
    5559SDESC=b2grip
    56 #MODE=bridge ap
    57 #ESSID=il-zo.imi.wleiden.net
    58 #CHANNEL=4
    59 #BulletMAC=00:15:6D:
     60MODE=bridge ap
     61ESSID=il-zo.imi.wleiden.net
     62CHANNEL=4
     63BulletMAC=00:15:6D:
    6064VR2
    6165
    62 $config{'ue0'}=sprintf <<UE0; # b-Link naar Thomas
     66$config{'ue0'}=sprintf <<UE0;
     67COMMENT=b-Link naar Thomas
    6368TYPE=ethernet
    6469EXTRA_TYPE=eth2wifibridge
     
    6772DESC=Link naar Thomas
    6873SDESC=2thomas
    69 #MODE=bridge ap
    70 #ESSID=il-no.imi.wleiden.net
    71 #CHANNEL=7
    72 #BulletMAC=00:15:6D:
     74MODE=bridge ap
     75ESSID=il-no.imi.wleiden.net
     76CHANNEL=7
     77BulletMAC=00:15:6D:
    7378UE0
    7479
    75 $config{'ue0:0'}=sprintf <<UE00;# b-Link naar LvLz
     80$config{'ue0:0'}=sprintf <<UE00;
     81COMMENT=b-Link naar LvLz
    7682TYPE=ethernet
    7783EXTRA_TYPE=eth2wifibridge
  • nodes/CNodeJVC/wleiden.conf

    r7943 r8261  
    1010$Y='461946';
    1111
    12 $config{'ath0'}=sprintf <<ATH0;  # omni
     12$config{'ath0'}=sprintf <<ATH0;
     13COMMENT=omni
    1314TYPE=wireless
    1415IP=$master_ip/26
     
    2122ATH0
    2223
    23 $config{'vr0'}=sprintf <<VR0; # a-link to Graficall via Nanostation5
     24$config{'vr0'}=sprintf <<VR0;
     25COMMENT=a-link to Graficall via Nanostation5
    2426TYPE=ethernet
    2527EXTRA_TYPE=eth2wifibridge
     
    2830SDESC=2graficall
    2931DHCP=no
    30 #MODE=11a bridge managed
    31 #ESSID=il-zw.graficall.wleiden.net
    32 #CHANNEL=36
    33 #NSMAC=
     32MODE=11a bridge managed
     33ESSID=il-zw.graficall.wleiden.net
     34CHANNEL=36
     35NSMAC=
    3436VR0
    3537
    36 $config{'vr1'}=sprintf <<VR1; # link naar ROCl
     38$config{'vr1'}=sprintf <<VR1;
     39COMMENT=link naar ROCl
    3740TYPE=ethernet
    3841EXTRA_TYPE=eth2wifibridge
     
    4144SDESC=2ROC
    4245DHCP=no
    43 #MODE=11a bridge ap
    44 #ESSID=il-w.jvc.wleiden.net
    45 #CHANNEL=108
    46 #NSMAC=
     46MODE=11a bridge ap
     47ESSID=il-w.jvc.wleiden.net
     48CHANNEL=108
     49NSMAC=
    4750VR1
    4851
    49 $config{'vr2'}=sprintf <<VR2; # link naar Zwet
     52$config{'vr2'}=sprintf <<VR2;
     53COMMENT=link naar Zwet
    5054TYPE=ethernet
    5155EXTRA_TYPE=eth2wifibridge
     
    5458SDESC=2Zwet
    5559DHCP=no
    56 #MODE=11a bridge ap
    57 #ESSID=il-z.jvc.wleiden.net
    58 #CHANNEL=60
    59 #NSMAC=
     60MODE=11a bridge ap
     61ESSID=il-z.jvc.wleiden.net
     62CHANNEL=60
     63NSMAC=
    6064VR2
    6165
  • nodes/CNodeKaag/wleiden.conf

    r7660 r8261  
    1919$Y='469717';
    2020
    21 $config{'sis0'}=sprintf <<ED0;  # Ethernet
     21$config{'sis0'}=sprintf <<ED0;
     22COMMENT=Ethernet
    2223TYPE=ethernet
    2324IP=172.27.0.65/28
     
    3132ED0
    3233
    33 $config{'wi0'}=sprintf <<EW0;  # Omni voor de buurt
     34$config{'wi0'}=sprintf <<EW0;
     35COMMENT=Omni voor de buurt
    3436TYPE=wireless
    3537IP=$master_ip/26
     
    3840
    3941
    40 #DHCP=no
     42DHCP=no
    4143DHCP=10-60
    4244
     
    4951EW0
    5052
    51 $config{'wi1'}=sprintf <<EW1;  # link naar UniGorN
     53$config{'wi1'}=sprintf <<EW1;
     54COMMENT=link naar UniGorN
    5255TYPE=wireless
    5356IP=172.16.0.218/30
  • nodes/CNodeKaag2/wleiden.conf

    r8120 r8261  
    1919$Y='470298';
    2020
    21 $config{'sis0'}=sprintf <<ED0;  # Ethernet
     21$config{'sis0'}=sprintf <<ED0;
     22COMMENT=Ethernet
    2223TYPE=ethernet
    2324IP=172.27.8.65/26
     
    2728ED0
    2829
    29 $config{'wi0'}=sprintf <<EW0;  # Omni voor de buurt
     30$config{'wi0'}=sprintf <<EW0;
     31COMMENT=Omni voor de buurt
    3032TYPE=wireless
    3133IP=$master_ip/26
    3234DESC=Omni voor de buurt
    3335SDESC=omni
    34 #DHCP=no
     36DHCP=no
    3537DHCP=10-60
    3638MODE=master
     
    3941EW0
    4042
    41 $config{'wi1'}=sprintf <<EW1;  # link naar UnigorN
     43$config{'wi1'}=sprintf <<EW1;
     44COMMENT=link naar UnigorN
    4245TYPE=wireless
    4346IP=172.16.1.46/30
  • nodes/CNodeKoster/wleiden.conf

    r8260 r8261  
    2020#$AGGREGATE=22;
    2121
    22 $config{'sis0'}=sprintf <<SIS0;  # Ethernet (Proxy)
     22$config{'sis0'}=sprintf <<SIS0;
     23COMMENT=Ethernet (Proxy)
    2324TYPE=ethernet
    2425IP=172.17.255.228/29
     
    2728SDESC=eth
    2829
    29 #DHCP=68-70
     30DHCP=68-70
    3031DHCP=no
    3132
     
    3435SIS0
    3536
    36 $config{'sis1'}=sprintf <<SIS1;  # Ethernet
     37$config{'sis1'}=sprintf <<SIS1;
     38COMMENT=Ethernet
    3739TYPE=ethernet
    3840IP=172.28.176.75/29
     
    4749
    4850
    49 $config{'wi0'}=sprintf <<EW0;  # OMNI
     51$config{'wi0'}=sprintf <<EW0;
     52COMMENT=OMNI
    5053TYPE=wireless
    5154IP=$master_ip/26
     
    6669
    6770
    68 $config{'wi1'}=sprintf <<EW1;  # interlink naar noord HWFortis2
     71$config{'wi1'}=sprintf <<EW1;
     72COMMENT=interlink naar noord HWFortis2
    6973TYPE=wireless
    7074IP=172.28.1.158/30
     
    8387
    8488
    85 $config{'wi2'}=sprintf <<EW2;  # interlink naar Stadhuis
     89$config{'wi2'}=sprintf <<EW2;
     90COMMENT=interlink naar Stadhuis
    8691TYPE=wireless
    8792IP=172.28.1.129/30
  • nodes/CNodeLCPL/wleiden.conf

    r7657 r8261  
    2020$LOKATIE='Roseveltstraat 4c, Leiden';
    2121
    22 $config{'sis0'}=sprintf <<ED0;  # Ethernet
     22$config{'sis0'}=sprintf <<ED0;
     23COMMENT=Ethernet
    2324TYPE=ethernet
    2425IP=172.21.16.65/28
     
    3233ED0
    3334
    34 $config{'sis0:0'}=sprintf <<ED00;  # Ethernet
     35$config{'sis0:0'}=sprintf <<ED00;
     36COMMENT=Ethernet
    3537TYPE=ethernet
    3638IP=172.21.16.97/27
     
    4446ED00
    4547
    46 $config{'sis0:1'}=sprintf <<ED01; # Ethernet
     48$config{'sis0:1'}=sprintf <<ED01;
     49COMMENT=Ethernet
    4750TYPE=ethernet
    4851IP=172.21.16.129/28
     
    5659ED01
    5760
    58 $config{'wi0'}=sprintf <<EW0;  # omni
     61$config{'wi0'}=sprintf <<EW0;
     62COMMENT=omni
    5963TYPE=wireless
    6064IP=$master_ip/26
     
    7377EW0
    7478
    75 $config{'wi1'}=sprintf <<EW1; #Link naar Haagwijk
     79$config{'wi1'}=sprintf <<EW1;
     80COMMENT=Link naar Haagwijk
    7681
    7782TYPE=wireless
     
    8489ESSID=il-o.haagwijk.wleiden.net
    8590
    86 #CHANNEL=9
     91CHANNEL=9
    8792
    8893
     
    9196EW1
    9297
    93 $config{'wi2'}=sprintf <<EW2;  # Link naar Grip
     98$config{'wi2'}=sprintf <<EW2;
     99COMMENT=Link naar Grip
    94100TYPE=wireless
    95101IP=172.16.1.2/30
     
    101107ESSID=il-zw.grip.wleiden.net
    102108
    103 #CHANNEL=9
     109CHANNEL=9
    104110
    105111
  • nodes/CNodeLMdorp/wleiden.conf

    r8260 r8261  
    1919$LOCATION='Dorpskerk, Dorpsstraat, Leimuiden';
    2020
    21 $config{'sis0'}=sprintf <<ED0;  # eth
     21$config{'sis0'}=sprintf <<ED0;
     22COMMENT=eth
    2223TYPE=ethernet
    2324IP=172.25.40.65/29
     
    2930ED0
    3031
    31 $config{'wi0'}=sprintf <<EW0;  # OMNI
     32$config{'wi0'}=sprintf <<EW0;
     33COMMENT=OMNI
    3234TYPE=wireless
    3335IP=$master_ip/26
     
    4648EW0
    4749
    48 $config{'wi1'}=sprintf <<EW1;  # link naar LMKempers1
     50$config{'wi1'}=sprintf <<EW1;
     51COMMENT=link naar LMKempers1
    4952TYPE=wireless
    5053IP=172.16.1.194/30
     
    5558MODE=managed
    5659ESSID=il-zw.kmprs.wleiden.net
    57 #CHANNEL=1
     60CHANNEL=1
    5861
    5962
     
    6265EW1
    6366
    64 $config{'wi2'}=sprintf <<EW2;  # link naar Space
     67$config{'wi2'}=sprintf <<EW2;
     68COMMENT=link naar Space
    6569TYPE=wireless
    6670IP=172.16.0.61/30
  • nodes/CNodeLMkempers1/wleiden.conf

    r8049 r8261  
    1717$AGGREGATE=22;
    1818
    19 $config{'sis0'}=sprintf <<ED0;  # ethernet poort 0 Soekris
     19$config{'sis0'}=sprintf <<ED0;
     20COMMENT=ethernet poort 0 Soekris
    2021TYPE=ethernet
    2122IP=$master_ip/29
     
    2930ED0
    3031
    31 $config{'sis1'}=sprintf <<ED1;  # eth poort 1 naar node kempers2
     32$config{'sis1'}=sprintf <<ED1;
     33COMMENT=eth poort 1 naar node kempers2
    3234TYPE=ethernet
    3335IP=172.16.1.201/30
     
    4244ED1
    4345
    44 $config{'wi0'}=sprintf <<EW0;  # Link naar LMDorp
     46$config{'wi0'}=sprintf <<EW0;
     47COMMENT=Link naar LMDorp
    4548TYPE=wireless
    4649IP=172.16.1.193/30
     
    5659EW0
    5760
    58 $config{'wi0:0'}=sprintf <<EW00; #link naar lmstruykverwo2
     61$config{'wi0:0'}=sprintf <<EW00;
     62COMMENT=link naar lmstruykverwo2
    5963TYPE=wireless
    6064IP=172.16.1.205/30
     
    6973EW00
    7074
    71 $config{'wi1'}=sprintf <<EW1;  # link kempers naar BDBoon
     75$config{'wi1'}=sprintf <<EW1;
     76COMMENT=link kempers naar BDBoon
    7277TYPE=wireless
    7378IP=172.16.1.213/30
  • nodes/CNodeLMkempers2/wleiden.conf

    r7657 r8261  
    1616$Y='471200';
    1717
    18 $config{'sis0'}=sprintf <<ED0;  # eth poort 0 Kempers2
     18$config{'sis0'}=sprintf <<ED0;
     19COMMENT=eth poort 0 Kempers2
    1920TYPE=ethernet
    2021IP=172.25.84.65/29
     
    2728ED0
    2829
    29 $config{'sis1'}=sprintf <<ED1;  # eth Link naar Kempers1
     30$config{'sis1'}=sprintf <<ED1;
     31COMMENT=eth Link naar Kempers1
    3032TYPE=ethernet
    3133IP=172.16.1.202/30
     
    3941ED1
    4042
    41 $config{'ath0'}=sprintf <<EW0;  # OMNI voor Westeinder
     43$config{'ath0'}=sprintf <<EW0;
     44COMMENT=OMNI voor Westeinder
    4245TYPE=wireless
    4346IP=$master_ip/26
     
    5558EW0
    5659
    57 $config{'wi0'}=sprintf <<EW1;  # Link naar AMWTR
     60$config{'wi0'}=sprintf <<EW1;
     61COMMENT=Link naar AMWTR
    5862TYPE=wireless
    5963IP=172.16.1.209/30
  • nodes/CNodeLMstruykverwo1/wleiden.conf

    r8260 r8261  
    1919$AGGREGATE=22;
    2020
    21 $config{'sis0'}=sprintf <<ED0;  # ethernet poort 0
     21$config{'sis0'}=sprintf <<ED0;
     22COMMENT=ethernet poort 0
    2223TYPE=ethernet
    2324IP=172.25.70.65/29
     
    3031ED0
    3132
    32 $config{'sis1'}=sprintf <<ED0;  # ethernet poort naar Struykverwo2
     33$config{'sis1'}=sprintf <<ED0;
     34COMMENT=ethernet poort naar Struykverwo2
    3335TYPE=ethernet
    3436IP=172.16.1.181/30
     
    4244ED0
    4345
    44 $config{'wi0'}=sprintf <<EW0;  # link Rijnsaterwoude Gem Huis, (was hoofdorp)
     46$config{'wi0'}=sprintf <<EW0;
     47COMMENT=link Rijnsaterwoude Gem Huis, (was hoofdorp)
    4548TYPE=wireless
    4649IP=172.16.1.54/30
     
    5659EW0
    5760
    58 $config{'wi1'}=sprintf <<EW1; # OMNI voor de buurt ap.lmstruykverwo.wleiden.net
     61$config{'wi1'}=sprintf <<EW1;
     62COMMENT=OMNI voor de buurt ap.lmstruykverwo.wleiden.net
    5963TYPE=wireless
    6064IP=$master_ip/26
     
    7276EW1
    7377
    74 $config{'wi2'}=sprintf <<EW2;  # Inter link hoogmade - struyk Verwo
     78$config{'wi2'}=sprintf <<EW2;
     79COMMENT=Inter link hoogmade - struyk Verwo
    7580TYPE=wireless
    7681IP=172.16.1.186/30
     
    8085MODE=managed
    8186ESSID=il-no.hmkerk.wleiden.net
    82 #CHANNEL=13
     87CHANNEL=13
    8388
    8489
  • nodes/CNodeLMstruykverwo2/wleiden.conf

    r7657 r8261  
    2020$AGGREGATE=22;
    2121
    22 $config{'sis0'}=sprintf <<ED0;  # ethernet poort 0 StruykVerwo2
     22$config{'sis0'}=sprintf <<ED0;
     23COMMENT=ethernet poort 0 StruykVerwo2
    2324TYPE=ethernet
    2425IP=172.25.74.65/29
     
    3233ED0
    3334
    34 $config{'sis1'}=sprintf <<ED1;  # Ethernet naar LMStruykVerwo1
     35$config{'sis1'}=sprintf <<ED1;
     36COMMENT=Ethernet naar LMStruykVerwo1
    3537TYPE=ethernet
    3638IP=172.16.1.182/30
     
    4446ED1
    4547
    46 $config{'wi0'}=sprintf <<EW0;  # interlink struykverwo kaag
     48$config{'wi0'}=sprintf <<EW0;
     49COMMENT=interlink struykverwo kaag
    4750TYPE=wireless
    4851IP=172.16.1.197/30
     
    5760EW0
    5861
    59 $config{'wi1'}=sprintf <<EW1;  # Interlink kempers - struykverwo
     62$config{'wi1'}=sprintf <<EW1;
     63COMMENT=Interlink kempers - struykverwo
    6064TYPE=wireless
    6165IP=172.16.1.206/30
     
    6569MODE=managed
    6670ESSID=il-zw.kmprs.wleiden.net
    67 #CHANNEL=1
     71CHANNEL=1
    6872
    6973
  • nodes/CNodeLUMC/wleiden.conf

    r8210 r8261  
    2121ATH0
    2222
    23 $config{'vr0'}=sprintf <<VR0; # a-link naar UniGor
     23$config{'vr0'}=sprintf <<VR0;
     24COMMENT=a-link naar UniGor
    2425TYPE=ethernet
    2526EXTRA_TYPE=eth2wifibridge
     
    2829SDESC=2unigor
    2930DHCP=no
    30 #MODE=station
    31 #ESSID=il-Z0.unigor.wleiden.net
    32 #CHANNEL=128
    33 #NSMAC= 00:15:6D:70:54:C9
    34 #NSIP=172.16.4.83/29
     31MODE=station
     32ESSID=il-Z0.unigor.wleiden.net
     33CHANNEL=128
     34NSMAC= 00:15:6D:70:54:C9
     35NSIP=172.16.4.83/29
    3536VR0
    3637
    37 $config{'vr1'}=sprintf <<VR1; # a-link zuidoost
     38$config{'vr1'}=sprintf <<VR1;
     39COMMENT=a-link zuidoost
    3840TYPE=ethernet
    3941EXTRA_TYPE=eth2wifibridge
     
    4244SDESC=2centrum
    4345DHCP=no
    44 #MODE=ap
    45 #ESSID=il-z.lumc.wleiden.net
    46 #CHANNEL=36
    47 #NSMAC=00:15:6D:70:53:6D
    48 #NSIP=172.16.4.98/29
     46MODE=ap
     47ESSID=il-z.lumc.wleiden.net
     48CHANNEL=36
     49NSMAC=00:15:6D:70:53:6D
     50NSIP=172.16.4.98/29
    4951VR1
    5052
    51 $config{'vr2'}=sprintf <<VR2; # a-link zuidwest
     53$config{'vr2'}=sprintf <<VR2;
     54COMMENT=a-link zuidwest
    5255TYPE=ethernet
    5356EXTRA_TYPE=eth2wifibridge
     
    5659SDESC=2cam
    5760DHCP=no
    58 #MODE=ap
    59 #ESSID=il-zw.lumc.wleiden.net
    60 #CHANNEL=116
    61 #NSMAC=00:15:6D:BD:69:00
    62 #NSIP=172.16.4.106/29
     61MODE=ap
     62ESSID=il-zw.lumc.wleiden.net
     63CHANNEL=116
     64NSMAC=00:15:6D:BD:69:00
     65NSIP=172.16.4.106/29
    6366VR2
    6467
    65 $config{'ue0'}=sprintf <<UE0;  # naar webcam
     68$config{'ue0'}=sprintf <<UE0;
     69COMMENT=naar webcam
    6670TYPE=ethernet
    6771IP=172.16.3.21/30
  • nodes/CNodeLangeVoort/wleiden.conf

    r8152 r8261  
    1313$status='up';
    1414
    15 $config{'sis0'}=sprintf <<SIS0;  # eth
     15$config{'sis0'}=sprintf <<SIS0;
     16COMMENT=eth
    1617TYPE=ethernet
    1718IP=172.23.25.65/30
     
    2021SIS0
    2122
    22 $config{'wi0'}=sprintf <<EW0;  # Locale Omni
     23$config{'wi0'}=sprintf <<EW0;
     24COMMENT=Locale Omni
    2325TYPE=wireless
    2426IP=$master_ip/26
     
    3133EW0
    3234
    33 $config{'wi1'}=sprintf <<EW1;  # Link naar hofwijck
     35$config{'wi1'}=sprintf <<EW1;
     36COMMENT=Link naar hofwijck
    3437TYPE=wireless
    3538IP=172.16.3.134/30
     
    3841MODE=managed
    3942ESSID=il-w.hofwijck.wleiden.net
    40 #CHANNEL=3
     43CHANNEL=3
    4144DHCP=no
    4245EW1
    4346
    44 $config{'wi2'}=sprintf <<EW2;  # Link naar Lijtweg1
     47$config{'wi2'}=sprintf <<EW2;
     48COMMENT=Link naar Lijtweg1
    4549TYPE=wireless
    4650IP=172.16.3.66/30
  • nodes/CNodeLebkov/wleiden.conf

    r7657 r8261  
    2020$LOKATIE='Bargelaan 8';
    2121
    22 $config{'sis0'}=sprintf <<ED0;  # Ethernet
     22$config{'sis0'}=sprintf <<ED0;
     23COMMENT=Ethernet
    2324TYPE=ethernet
    2425IP=172.19.152.65/26
     
    2930ED0
    3031
    31 $config{'wi1'}=sprintf <<EW1;  # Link naar RABO
     32$config{'wi1'}=sprintf <<EW1;
     33COMMENT=Link naar RABO
    3234TYPE=wireless
    3335IP=172.16.1.18/30
     
    4244
    4345
    44 $config{'wi2'}=sprintf <<EW0;  # AP omni
     46$config{'wi2'}=sprintf <<EW0;
     47COMMENT=AP omni
    4548TYPE=wireless
    4649IP=$master_ip/26
     
    5558
    5659
    57 $config{'wi0'}=sprintf <<EW2;  # link naar Unigor
     60$config{'wi0'}=sprintf <<EW2;
     61COMMENT=link naar Unigor
    5862TYPE=wireless
    5963IP=172.16.1.14/30
  • nodes/CNodeLeythenrode/wleiden.conf

    r8137 r8261  
    1010$Y='463407';
    1111
    12 $config{'ath0'}=sprintf <<ATH0;  # Ap voor buurt
     12$COMMENT=sprintf <<EOF;
     13##configuration of local AP's
     14##
     15AP-1 zuidoost
     16ESSID=ap-zo.leythenrode
     17LAN_IP=172.17.0.3/24
     18MODE=bridge
     19CHANNEL=2
     20##
     21AP-2 zuidwest
     22ESSID=ap-zw.leythenrode
     23LAN_IP=172.17.0.4/24
     24MODE=bridge
     25CHANNEL=11
     26#
     27AP-3 noordwest
     28ESSID=ap-nw.leythenrode
     29LAN_IP=172.17.0.5/24
     30MODE=bridge
     31CHANNEL=5
     32#
     33AP-4 noordoost
     34ESSID=ap-no.leythenrode
     35LAN_IP=172.17.0.6/24
     36MODE=bridge
     37CHANNEL=8
     38EOF
     39
     40$config{'ath0'}=sprintf <<ATH0;
     41COMMENT=Ap voor buurt
    1342TYPE=wireless
    1443IP=$master_ip/26
     
    2150ATH0
    2251
    23 $config{'ue0'}=sprintf <<UE0;  # ethernet to local subnet with PoE
     52$config{'ue0'}=sprintf <<UE0;
     53COMMENT=ethernet to local subnet with PoE
    2454IP=172.17.0.2/24
    2555DESC=local ethernet with proxy7 and local clients (ap's bridge)
     
    2959UE0
    3060
    31 #configuration of local AP's
    32 #
    33 #AP-1 zuidoost
    34 #ESSID=ap-zo.leythenrode
    35 #LAN_IP=172.17.0.3/24
    36 #MODE=bridge
    37 #CHANNEL=2
    38 #
    39 #AP-2 zuidwest
    40 #ESSID=ap-zw.leythenrode
    41 #LAN_IP=172.17.0.4/24
    42 #MODE=bridge
    43 #CHANNEL=11
    4461
    45 #AP-3 noordwest
    46 #ESSID=ap-nw.leythenrode
    47 #LAN_IP=172.17.0.5/24
    48 #MODE=bridge
    49 #CHANNEL=5
    50 
    51 #AP-4 noordoost
    52 #ESSID=ap-no.leythenrode
    53 #LAN_IP=172.17.0.6/24
    54 #MODE=bridge
    55 #CHANNEL=8
    56 
    57 $config{'vr0'}=sprintf <<VR0; # a-link naar AA24
     62$config{'vr0'}=sprintf <<VR0;
     63COMMENT=a-link naar AA24
    5864TYPE=ethernet
    5965EXTRA_TYPE=eth2wifibridge
     
    6167DESC=Ethernet naar interlink zuidoost (AA24)
    6268SDESC=2AA24
    63 #MODE=master
    64 #ESSID=il-zo.leythenrode.wleiden.net
    65 #CHANNEL=100
    66 #NSMAC=00:15:6D:EB:F1:33
     69MODE=master
     70ESSID=il-zo.leythenrode.wleiden.net
     71CHANNEL=100
     72NSMAC=00:15:6D:EB:F1:33
    6773VR0
    6874
    69 $config{'vr1'}=sprintf <<VR1; # a-link naar Graficall via Nanostation5
     75$config{'vr1'}=sprintf <<VR1;
     76COMMENT=a-link naar Graficall via Nanostation5
    7077TYPE=ethernet
    7178EXTRA_TYPE=eth2wifibridge
     
    7380DESC=Ethernet naar interlink noordoost (graficall)
    7481SDESC=2Graficall
    75 #MODE=master
    76 #ESSID=il-no.leythenrode.wleiden.net
    77 #CHANNEL=52
    78 #NSMAC=00:15:6D:BD:8A:06
    79 #NS_IP=192.168.1.20
     82MODE=master
     83ESSID=il-no.leythenrode.wleiden.net
     84CHANNEL=52
     85NSMAC=00:15:6D:BD:8A:06
     86NS_IP=192.168.1.20
    8087VR1
    8188
    82 $config{'vr2'}=sprintf <<VR2; # a-link to DeClercq via Nanostation5
     89$config{'vr2'}=sprintf <<VR2;
     90COMMENT=a-link to DeClercq via Nanostation5
    8391TYPE=ethernet
    8492EXTRA_TYPE=eth2wifibridge
     
    8694DESC=ethernet naar interlink zuidwest (DeClercq))
    8795SDESC=2DeClercq
    88 #MODE=master
    89 #ESSID=il-zw.leythenrode.wleiden.net
    90 #CHANNEL=44
     96MODE=master
     97ESSID=il-zw.leythenrode.wleiden.net
     98CHANNEL=44
    9199VR2
    92100
    93 $config{'vr2:0'}=sprintf <<VR20; # temp. a-link to Roomburgh2 via Nanostation5
     101$config{'vr2:0'}=sprintf <<VR20;
     102COMMENT=temp. a-link to Roomburgh2 via Nanostation5
    94103TYPE=ethernet
    95104EXTRA_TYPE=eth2wifibridge
     
    97106DESC=ethernet naar interlink zuidwest (Roomburgh2)
    98107SDESC=2Roomburgh2
    99 #MODE=master
    100 #ESSID=il-zw.leythenrode.wleiden.net
    101 #CHANNEL=44
     108MODE=master
     109ESSID=il-zw.leythenrode.wleiden.net
     110CHANNEL=44
    102111VR20
    103112
  • nodes/CNodeLijtweg1/wleiden.conf

    r8260 r8261  
    1010$Y=466740;
    1111
    12 $config{'ath0'}=sprintf <<ATH0;  # ap noord
     12$config{'ath0'}=sprintf <<ATH0;
     13COMMENT=ap noord
    1314TYPE=wireless
    1415IP=$master_ip/26
     
    2122ATH0
    2223
    23 $config{'ue0'}=sprintf <<UE0; # link naar Lange Voort
     24$config{'ue0'}=sprintf <<UE0;
     25COMMENT=link naar Lange Voort
    2426TYPE=ethernet
    2527EXTRA_TYPE=eth2wifibridge
     
    2830IP=172.16.3.65/30
    2931DHCP=no
    30 #MODE=ap
    31 #ESSID=il-o.lijtweg1.wleiden.net
    32 #CHANNEL=2
    33 #BulletIP=192.168.1.20
    34 #BulletMAC=
     32MODE=ap
     33ESSID=il-o.lijtweg1.wleiden.net
     34CHANNEL=2
     35BulletIP=192.168.1.20
     36BulletMAC=
    3537UE0
    3638
    37 $config{'ue1'}=sprintf <<UE1;  # Ethernet naar Lijtweg2
     39$config{'ue1'}=sprintf <<UE1;
     40COMMENT=Ethernet naar Lijtweg2
    3841TYPE=ethernet
    3942IP=172.16.253.1/30
     
    4346UE1
    4447
    45 $config{'vr0'}=sprintf <<VR0; # Link naar Rene
     48$config{'vr0'}=sprintf <<VR0;
     49COMMENT=Link naar Rene
    4650TYPE=ethernet
    4751EXTRA_TYPE=eth2wifibridge
     
    5054SDESC=2rene
    5155DHCP=no
    52 #MODE=bridge ap
    53 #ESSID=il-n.lijtweg1.wleiden.net
    54 #CHANNEL=108
    55 #NS_IP=192.168.1.20
    56 #NSMAC=
     56MODE=bridge ap
     57ESSID=il-n.lijtweg1.wleiden.net
     58CHANNEL=108
     59NS_IP=192.168.1.20
     60NSMAC=
    5761VR0
    5862
    59 $config{'vr1'}=sprintf <<VR1; # Link naar Hofwijck
     63$config{'vr1'}=sprintf <<VR1;
     64COMMENT=Link naar Hofwijck
    6065TYPE=ethernet
    6166EXTRA_TYPE=eth2wifibridge
     
    6469SDESC=2hofwijck
    6570DHCP=no
    66 #MODE=bridge ap
    67 #ESSID=il-o.lijtweg1.wleiden.net
    68 #CHANNEL=124
    69 #NS_IP=192.168.1.20
    70 #NSMAC=
     71MODE=bridge ap
     72ESSID=il-o.lijtweg1.wleiden.net
     73CHANNEL=124
     74NS_IP=192.168.1.20
     75NSMAC=
    7176VR1
    7277
    73 $config{'vr2'}=sprintf <<VR2; # Link naar Aster
     78$config{'vr2'}=sprintf <<VR2;
     79COMMENT=Link naar Aster
    7480TYPE=ethernet
    7581EXTRA_TYPE=eth2wifibridge
     
    7884DESC=Link naar Aster
    7985SDESC=2aster
    80 #MODE=bridge ap
    81 #ESSID=il-w.lijtweg1.wleiden.net
    82 #CHANNEL=116
    83 #NS_IP=192.168.1.20
    84 #NSMAC=
     86MODE=bridge ap
     87ESSID=il-w.lijtweg1.wleiden.net
     88CHANNEL=116
     89NS_IP=192.168.1.20
     90NSMAC=
    8591VR2
    8692
  • nodes/CNodeLijtweg2/wleiden.conf

    r8260 r8261  
    1010$Y='466702';
    1111
    12 $config{'ath0'}=sprintf <<ATH0;  # ap zuid
     12$config{'ath0'}=sprintf <<ATH0;
     13COMMENT=ap zuid
    1314TYPE=wireless
    1415IP=$master_ip/26
     
    2122ATH0
    2223
    23 $config{'ue0'}=sprintf <<UE0;  # Ethernet naar Lijtweg1
     24$config{'ue0'}=sprintf <<UE0;
     25COMMENT=Ethernet naar Lijtweg1
    2426TYPE=ethernet
    2527IP=172.16.253.2/30
     
    2931UE0
    3032
    31 $config{'ue1'}=sprintf <<UE1;  # Link naar AZC
     33$config{'ue1'}=sprintf <<UE1;
     34COMMENT=Link naar AZC
    3235TYPE=ethernet
    3336EXTRA_TYPE=eth2wifibridge
     
    3639IP=172.16.1.98/30
    3740DHCP=no
    38 #MODE=bridge station
    39 #ESSID=il-n.azc.wleiden.net
    40 #CHANNEL=7
    41 #NS_IP=192.168.1.21
    42 #BulletMAC=
     41MODE=bridge station
     42ESSID=il-n.azc.wleiden.net
     43CHANNEL=7
     44NS_IP=192.168.1.21
     45BulletMAC=
    4346UE1
    4447
    45 $config{'vr0'}=sprintf <<VR0; # Link naar Rustenborch
     48$config{'vr0'}=sprintf <<VR0;
     49COMMENT=Link naar Rustenborch
    4650TYPE=ethernet
    4751EXTRA_TYPE=eth2wifibridge
     
    5054SDESC=2rustenborch
    5155DHCP=no
    52 #MODE=bridge ap
    53 #ESSID=il-w.lijtweg2.wleiden.net
    54 #CHANNEL=144
    55 #NS_IP=192.168.1.20
    56 #NSMAC=
     56MODE=bridge ap
     57ESSID=il-w.lijtweg2.wleiden.net
     58CHANNEL=144
     59NS_IP=192.168.1.20
     60NSMAC=
    5761VR0
    5862
    59 $config{'vr1'}=sprintf <<VR1; # Link naar Brug
     63$config{'vr1'}=sprintf <<VR1;
     64COMMENT=Link naar Brug
    6065TYPE=ethernet
    6166EXTRA_TYPE=eth2wifibridge
     
    6469SDESC=2brug
    6570DHCP=no
    66 #MODE=bridge ap
    67 #ESSID=il-z.lijtweg2.wleiden.net
    68 #CHANNEL=132
    69 #NS_IP=192.168.1.20
    70 #NSMAC=
     71MODE=bridge ap
     72ESSID=il-z.lijtweg2.wleiden.net
     73CHANNEL=132
     74NS_IP=192.168.1.20
     75NSMAC=
    7176VR1
    7277
    73 $config{'vr1:0'}=sprintf <<VR10; # Link naar Camimplants
     78$config{'vr1:0'}=sprintf <<VR10;
     79COMMENT=Link naar Camimplants
    7480TYPE=ethernet
    7581EXTRA_TYPE=eth2wifibridge
     
    8086VR10
    8187
    82 $config{'vr2'}=sprintf <<VR2; # Link naar Broekplein
     88$config{'vr2'}=sprintf <<VR2;
     89COMMENT=Link naar Broekplein
    8390TYPE=ethernet
    8491EXTRA_TYPE=eth2wifibridge
     
    8794SDESC=2broekplein
    8895DHCP=no
    89 #MODE=bridge station
    90 #ESSID=il-w.broekplein.wleiden.net
    91 #CHANNEL=44
    92 #NS_IP=192.168.1.21
    93 #NSMAC=
     96MODE=bridge station
     97ESSID=il-w.broekplein.wleiden.net
     98CHANNEL=44
     99NS_IP=192.168.1.21
     100NSMAC=
    94101VR2
    95102
  • nodes/CNodeLivingLab/wleiden.conf

    r7657 r8261  
    119119SIS3
    120120
    121 $config{'ath0'}=sprintf <<ATH0;  # Ap voor buurt
     121$config{'ath0'}=sprintf <<ATH0;
     122COMMENT=Ap voor buurt
    122123TYPE=wireless
    123124IP=$master_ip/26
  • nodes/CNodeLorentzhof/wleiden.conf

    r7657 r8261  
    2020$LOKATIE='Lorentzhof 1, 2313 GA,  Leiden';
    2121
    22 $config{'sis0'}=sprintf <<ED0;  # Ethernet
     22$config{'sis0'}=sprintf <<ED0;
     23COMMENT=Ethernet
    2324TYPE=ethernet
    2425IP=172.18.64.65/28
     
    3435
    3536
    36 $config{'wi0'}=sprintf <<EW0;  # omni
     37$config{'wi0'}=sprintf <<EW0;
     38COMMENT=omni
    3739TYPE=wireless
    3840IP=$master_ip/26
     
    6264HEIGHT=13
    6365DHCP=no
    64 #CHANNEL 2
     66CHANNEL 2
    6567EW1
    6668
    6769
    68 $config{'wi2'}=sprintf <<EW2; #Link naar Plantsoen
     70$config{'wi2'}=sprintf <<EW2;
     71COMMENT=Link naar Plantsoen
    6972TYPE=wireless
    7073IP=172.16.1.225/30
     
    8285EW2
    8386
    84 $config{'wi3'}=sprintf <<EW3; #Link Haagwijk
     87$config{'wi3'}=sprintf <<EW3;
     88COMMENT=Link Haagwijk
    8589
    8690TYPE=wireless
     
    9397ESSID=il-o.haagwijk.wleiden.net
    9498
    95 #CHANNEL=1
     99CHANNEL=1
    96100
    97101HEIGHT=13
  • nodes/CNodeLvLn/wleiden.conf

    r7660 r8261  
    1818$Y='464130';
    1919
    20 $config{'ep0'}=sprintf <<ED0;  # eth
     20$config{'ep0'}=sprintf <<ED0;
     21COMMENT=eth
    2122TYPE=ethernet
    2223IP=172.17.144.65/29
     
    2930
    3031
    31 $config{'ep0:0'}=sprintf <<ED00;  # link naar lvln2 via ethernet
     32$config{'ep0:0'}=sprintf <<ED00;
     33COMMENT=link naar lvln2 via ethernet
    3234TYPE=ethernet
    3335IP=172.16.0.25/30
     
    3840
    3941
    40 $config{'wi0'}=sprintf <<EW0;  # OMNI
     42$config{'wi0'}=sprintf <<EW0;
     43COMMENT=OMNI
    4144TYPE=wireless
    4245IP=$master_ip/26
     
    5356EW0
    5457
    55 $config{'wi1'}=sprintf <<EW1;  # link naar cope
     58$config{'wi1'}=sprintf <<EW1;
     59COMMENT=link naar cope
    5660TYPE=wireless
    5761IP=172.16.0.70/30
     
    6872EW1
    6973
    70 $config{'wi2'}=sprintf <<EW2;  # link naar CeTIM (HLK)
     74$config{'wi2'}=sprintf <<EW2;
     75COMMENT=link naar CeTIM (HLK)
    7176TYPE=wireless
    7277IP=172.16.0.74/30
  • nodes/CNodeLvLn2/wleiden.conf

    r8260 r8261  
    1818$Y='464130';
    1919
    20 $config{'sis0'}=sprintf <<ED0;  # eth
     20$config{'sis0'}=sprintf <<ED0;
     21COMMENT=eth
    2122TYPE=ethernet
    2223IP=172.17.144.66/29
     
    3031
    3132
    32 $config{'sis0:0'}=sprintf <<ED00;  # link naar lvln via ethernet
     33$config{'sis0:0'}=sprintf <<ED00;
     34COMMENT=link naar lvln via ethernet
    3335TYPE=ethernet
    3436SDESC=2lvln
     
    3941
    4042
    41 $config{'ath0'}=sprintf <<EW0;  # alink 2 stadhuis2
     43$config{'ath0'}=sprintf <<EW0;
     44COMMENT=alink 2 stadhuis2
    4245TYPE=wireless
    4346SUBTYPE=802.11a
     
    5659EW0
    5760
    58 $config{'ath1'}=sprintf <<EW1;  # link naar rabo
     61$config{'ath1'}=sprintf <<EW1;
     62COMMENT=link naar rabo
    5963TYPE=wireless
    6064IP=172.16.0.98/30
  • nodes/CNodeLvLz/wleiden.conf

    r8260 r8261  
    1919$Y='463350';
    2020
    21 $config{'ep0'}=sprintf <<ED0;  # eth
     21$config{'ep0'}=sprintf <<ED0;
     22COMMENT=eth
    2223TYPE=ethernet
    2324IP=172.17.40.65/29
     
    4243MODE=managed
    4344ESSID=il-no.imi.wleiden.net
    44 #CHANNEL=11
     45CHANNEL=11
    4546
    4647
     
    5758MODE=managed
    5859ESSID=il-zw.cetim2.wleiden.net
    59 #CHANNEL=1
     60CHANNEL=1
    6061
    6162
  • nodes/CNodeMuiderkring/wleiden.conf

    r8136 r8261  
    1212$status='up';
    1313
    14 $config{'ath0'}=sprintf <<ATH0;  # Lokaal accesspoint
     14$config{'ath0'}=sprintf <<ATH0;
     15COMMENT=Lokaal accesspoint
    1516TYPE=wireless
    1617IP=$master_ip/26
     
    2324ATH0
    2425
    25 $config{'vr0'}=sprintf <<VR0;  # eth
     26$config{'vr0'}=sprintf <<VR0;
     27COMMENT=eth
    2628TYPE=ethernet
    2729IP=172.16.3.145/30
     
    3133VR0
    3234
    33 $config{'vr1'}=sprintf <<VR1;  # Link naar AJSoft
     35$config{'vr1'}=sprintf <<VR1;
     36COMMENT=Link naar AJSoft
    3437TYPE=ethernet
    3538EXTRA_TYPE=eth2wifibridge
     
    3740DESC=Link naar AJSoft
    3841SDESC=2ajsoft
    39 #MODE=managed
    40 #ESSID=il-nno.ajsoft2.wleiden.net
    41 #CHANNEL=1
     42MODE=managed
     43ESSID=il-nno.ajsoft2.wleiden.net
     44CHANNEL=1
    4245DHCP=no
    43 #BulletMAC=00:15:6D:E8:E6:B1
    44 #BulletIP=192.168.1.21
     46BulletMAC=00:15:6D:E8:E6:B1
     47BulletIP=192.168.1.21
    4548VR1
  • nodes/CNodeOBLc/wleiden.conf

    r7925 r8261  
    1818$Y='463741';
    1919
    20 $config{'xl0'}=sprintf <<XL0;  # Ethernet
     20$config{'xl0'}=sprintf <<XL0;
     21COMMENT=Ethernet
    2122TYPE=ethernet
    2223IP=172.17.152.65/27
     
    3132XL0
    3233
    33 $config{'ep0'}=sprintf <<EP0;  # Ethernet
     34$config{'ep0'}=sprintf <<EP0;
     35COMMENT=Ethernet
    3436TYPE=ethernet
    3537IP=$master_ip/24
     
    4648
    4749
    48 $config{'wi0'}=sprintf <<EW1;  # link naar CeTIM3
     50$config{'wi0'}=sprintf <<EW1;
     51COMMENT=link naar CeTIM3
    4952TYPE=wireless
    5053IP=172.16.0.162/30
  • nodes/CNodePPFortis/wleiden.conf

    r7660 r8261  
    2020#$AGGREGATE=22;
    2121
    22 $config{'sis0'}=sprintf <<SIS0;  # Ethernet IP's 65 - 70 /248
     22$config{'sis0'}=sprintf <<SIS0;
     23COMMENT=Ethernet IP's 65 - 70 /248
    2324TYPE=ethernet
    2425IP=172.28.138.65/29
     
    3334
    3435
    35 #$config{'sis1'}=sprintf <<SIS1;  # Ethernet
    36 #TYPE=ethernet
    37 #IP=172.28.138.73/29
    38 #
    39 #DESC=Ethernet naar ......
    40 #SDESC=eth
    41 #
    42 #DHCP=no
    43 #
    44 #
    45 #SIS1
     36$config{'sis1'}=sprintf <<SIS1;
     37TYPE=ethernet
     38IP=172.28.138.73/29
     39
     40DESC=Ethernet naar onbekend
     41SDESC=eth
     42
     43DHCP=no
    4644
    4745
    48 $config{'wi0'}=sprintf <<EW0;  # OMNI
     46SIS1
     47
     48
     49$config{'wi0'}=sprintf <<EW0;
     50COMMENT=OMNI
    4951TYPE=wireless
    5052IP=$master_ip/26
     
    6567
    6668
    67 $config{'wi1'}=sprintf <<EW1;  # Planned interlink Richting Leiden
     69$config{'wi1'}=sprintf <<EW1;
     70COMMENT=Planned interlink Richting Leiden
    6871TYPE=wireless
    6972IP=172.16.28.1/30
     
    8386
    8487
    85 $config{'wi2'}=sprintf <<EW2;  # interlink naar Stadhuis
     88$config{'wi2'}=sprintf <<EW2;
     89COMMENT=interlink naar Stadhuis
    8690TYPE=wireless
    8791IP=172.28.1.137/30
  • nodes/CNodePlantsoen2/wleiden.conf

    r7677 r8261  
    1717
    1818
    19 $config{'ath0'}=sprintf <<ATH0;  # AP voor buurt
     19$config{'ath0'}=sprintf <<ATH0;
     20COMMENT=AP voor buurt
    2021TYPE=wireless
    2122IP=$master_ip/26
     
    2829ATH0
    2930
    30 $config{'vr0'}=sprintf <<VR0;  # Lokaal ethernet met PoE
     31$config{'vr0'}=sprintf <<VR0;
     32COMMENT=Lokaal ethernet met PoE
    3133TYPE=ethernet
    3234IP=172.17.169.65/28
     
    3739VR0
    3840
    39 $config{'vr1'}=sprintf <<VR1; # a-link to Stadhuis via Nanostation5
     41$config{'vr1'}=sprintf <<VR1;
     42COMMENT=a-link to Stadhuis via Nanostation5
    4043TYPE=ethernet
    4144EXTRA_TYPE=eth2wifibridge
     
    4649VR1
    4750
    48 $config{'vr1:0'}=sprintf <<VR10; # ethernet to nanostation mgmt interface
     51$config{'vr1:0'}=sprintf <<VR10;
     52COMMENT=ethernet to nanostation mgmt interface
    4953TYPE=ethernet
    5054IP=172.16.3.189/30
     
    5256SDESC=manageNS5
    5357DHCP=no
    54 #MODE=managed
    55 #ESSID=il-zo.stadhuis.wleiden.net
    56 #CHANNEL=44
    57 #DISTANCE=0.5 km
     58MODE=managed
     59ESSID=il-zo.stadhuis.wleiden.net
     60CHANNEL=44
     61DISTANCE=0.5 km
    5862VR10
    5963
    60 $config{'vr2'}=sprintf <<VR2; # a-link to Vosko via Nanostation2
     64$config{'vr2'}=sprintf <<VR2;
     65COMMENT=a-link to Vosko via Nanostation2
    6166TYPE=ethernet
    6267EXTRA_TYPE=eth2wifibridge
     
    6772VR2
    6873
    69 $config{'vr2:0'}=sprintf <<VR20; # to Nanostation2 management interface
     74$config{'vr2:0'}=sprintf <<VR20;
     75COMMENT=to Nanostation2 management interface
    7076TYPE=ethernet
    7177IP=172.16.3.193/30
     
    7379SDESC=manageNS2
    7480DHCP=no
    75 #MODE=managed
    76 #ESSID=il-zo.vosko3.wleiden.net
    77 #CHANNEL=
    78 #DISTANCE=0.7 km
     81MODE=managed
     82ESSID=il-zo.vosko3.wleiden.net
     83CHANNEL=
     84DISTANCE=0.7 km
    7985VR20
  • nodes/CNodeROCl/wleiden.conf

    r7660 r8261  
    1818$Y='462243';
    1919
    20 $config{'ep0'}=sprintf <<ED0;  # Ethernet
     20$config{'ep0'}=sprintf <<ED0;
     21COMMENT=Ethernet
    2122TYPE=ethernet
    2223IP=172.21.1.65/28
     
    3233
    3334
    34 $config{'wi0'}=sprintf <<EW0;  # omni
     35$config{'wi0'}=sprintf <<EW0;
     36COMMENT=omni
    3537TYPE=wireless
    3638IP=$master_ip/26
     
    4951EW0
    5052
    51 $config{'wi1'}=sprintf <<EW1;  # link naar Marten
     53$config{'wi1'}=sprintf <<EW1;
     54COMMENT=link naar Marten
    5255TYPE=wireless
    5356IP=172.16.0.157/30
     
    6770
    6871
    69 $config{'wi1:0'}=sprintf <<EW10;  # link naar JVC
     72$config{'wi1:0'}=sprintf <<EW10;
     73COMMENT=link naar JVC
    7074TYPE=wireless
    7175IP=172.16.0.233/30
     
    8892EW11
    8993
    90 $config{'wi2'}=sprintf <<EW2;  # link naar Grip
     94$config{'wi2'}=sprintf <<EW2;
     95COMMENT=link naar Grip
    9196TYPE=wireless
    9297IP=172.16.0.253/30
     
    106111
    107112
    108 $config{'wi2:0'}=sprintf <<EW20;  # link naar Jasper
     113$config{'wi2:0'}=sprintf <<EW20;
     114COMMENT=link naar Jasper
    109115TYPE=wireless
    110116IP=172.16.0.153/30
     
    117123
    118124
    119 #$config{'wi2:1'}=sprintf <<EW21;  # link naar Zijloever
    120 #TYPE=wireless
    121 #IP=172.16.1.65/30
    122 #DESC=Link naar Zijloever
    123 #SDESC=2zijloever
     125$config{'wi2:1'}=sprintf <<EW21; 
     126COMMENT=link naar Zijloever
     127TYPE=wireless
     128IP=172.16.1.65/30
     129DESC=Link naar Zijloever
     130SDESC=2zijloever
    124131#
    125132#
    126 #DHCP=no
     133DHCP=no
    127134#
    128 #EW21
     135EW21
    129136
    130137
    131 $config{'wi3'}=sprintf <<EW3; # link naar haagwijk
     138$config{'wi3'}=sprintf <<EW3;
     139COMMENT=link naar haagwijk
    132140TYPE=wireless
    133141IP=172.16.3.90/30
     
    139147ESSID=il-z.haagwijk.wleiden.net
    140148
    141 #CHANNEL=11
     149CHANNEL=11
    142150
    143151
  • nodes/CNodeRV/wleiden.conf

    r8136 r8261  
    1010$Y='462819';
    1111
    12 $config{'ath0'}=sprintf <<ATH0;  # ap
     12$config{'ath0'}=sprintf <<ATH0;
     13COMMENT=ap
    1314TYPE=wireless
    1415IP=$master_ip/26
     
    2122ATH0
    2223
    23 $config{'vr0'}=sprintf <<VR0;  # b-link naar ajsoft
     24$config{'vr0'}=sprintf <<VR0;
     25COMMENT=b-link naar ajsoft
    2426TYPE=ethernet
    2527EXTRA_TYPE=eth2wifibridge
     
    2729DESC=Link naar ajsoft
    2830SDESC=b2ajsoft
    29 #MODE=master
    30 #ESSID=il-zw.rv.wleiden.net
    31 #CHANNEL=4
     31MODE=master
     32ESSID=il-zw.rv.wleiden.net
     33CHANNEL=4
    3234DHCP=no
    33 #BulletMAC=00:15:6D:E9:F9:B0
    34 #BulletIP=192.168.1.20
     35BulletMAC=00:15:6D:E9:F9:B0
     36BulletIP=192.168.1.20
    3537VR0
    3638
    37 $config{'vr1'}=sprintf <<VR1;  # link naar IMI
     39$config{'vr1'}=sprintf <<VR1;
     40COMMENT=link naar IMI
    3841TYPE=ethernet
    3942EXTRA_TYPE=eth2wifibridge
     
    4245DESC=Link naar IMI
    4346SDESC=2imi
    44 #MODE=bridge ap
    45 #ESSID=il-no.rv.wleiden.net
    46 #CHANNEL=60
    47 #NSMAC=00:15:6D:ED:82:7C
     47MODE=bridge ap
     48ESSID=il-no.rv.wleiden.net
     49CHANNEL=60
     50NSMAC=00:15:6D:ED:82:7C
    4851VR1
    4952
    50 $config{'vr2'}=sprintf <<VR2;  # a-link naar AJSoft
     53$config{'vr2'}=sprintf <<VR2;
     54COMMENT=a-link naar AJSoft
    5155TYPE=ethernet
    5256EXTRA_TYPE=eth2wifibridge
     
    5559DESC=a-Link naar AJSoft
    5660SDESC=a2ajsoft
    57 #MODE=managed
    58 #ESSID=il-o.ajsoft2.wleiden.net
    59 #CHANNEL=
    60 #NSMAC=00:15:6D:EC:82:40
    61 #NS_IP=192.168.1.21
     61MODE=managed
     62ESSID=il-o.ajsoft2.wleiden.net
     63CHANNEL=
     64NSMAC=00:15:6D:EC:82:40
     65NS_IP=192.168.1.21
    6266VR2
    6367
    64 $config{'ue0'}=sprintf <<UE0;  # Ethernet
     68$config{'ue0'}=sprintf <<UE0;
     69COMMENT=Ethernet
    6570TYPE=ethernet
    6671IP=172.20.128.65/27
     
    7075UE0
    7176
    72 $config{'ue1'}=sprintf <<UE1;  # Ethernet naar proxy
     77$config{'ue1'}=sprintf <<UE1;
     78COMMENT=Ethernet naar proxy
    7379TYPE=ethernet
    7480IP=172.20.128.97/29
  • nodes/CNodeRWgemhuis1/wleiden.conf

    r8049 r8261  
    1717$LOCATION='Gemeentehuis Jacobswoude Rijnsaterwoude';
    1818
    19 $config{'sis0'}=sprintf <<ED0;  # ethernet poort 0
     19$config{'sis0'}=sprintf <<ED0;
     20COMMENT=ethernet poort 0
    2021TYPE=ethernet
    2122IP=172.25.30.65/29
     
    2728ED0
    2829
    29 $config{'sis1'}=sprintf <<ED1;  # Link tussen eth 1 RWgemhuis2 en 1
     30$config{'sis1'}=sprintf <<ED1;
     31COMMENT=Link tussen eth 1 RWgemhuis2 en 1
    3032TYPE=ethernet
    3133IP=172.16.1.241/30
     
    3739ED1
    3840
    39 $config{'wi0'}=sprintf <<EW0;  # OMNI voor de buurt
     41$config{'wi0'}=sprintf <<EW0;
     42COMMENT=OMNI voor de buurt
    4043TYPE=wireless
    4144IP=$master_ip/26
     
    5255EW0
    5356
    54 #$config{'wi1'}=sprintf <<EW1;  # link naar Bilderdam
    55 #TYPE=wireless
    56 #IP=172.16.2.5/30
    57 #DESC=Link naar Bilderdam
    58 #SDESC=2BDboon
     57$config{'wi1'}=sprintf <<EW1;
     58COMMENT=link naar Bilderdam
     59TYPE=wireless
     60IP=172.16.2.5/30
     61DESC=Link naar Bilderdam
     62SDESC=2BDboon
    5963#
    60 #MODE=master
    61 #ESSID=il-no.rwgemhuis.wleiden.net
    62 #CHANNEL=13
     64MODE=master
     65ESSID=il-no.rwgemhuis.wleiden.net
     66CHANNEL=13
    6367#
    6468#
    65 #DHCP=no
     69DHCP=no
    6670#
    67 #EW1
     71EW1
    6872
    6973
  • nodes/CNodeRWgemhuis2/wleiden.conf

    r7657 r8261  
    1818$LOCATION='Gemeentehuis Jacobswoude Rijnsaterwoude';
    1919
    20 $config{'sis0'}=sprintf <<ED0;  # ethernet poort 0 Soekris
     20$config{'sis0'}=sprintf <<ED0;
     21COMMENT=ethernet poort 0 Soekris
    2122TYPE=ethernet
    2223IP=172.25.34.65/29
     
    2930ED0
    3031
    31 $config{'sis1'}=sprintf <<ED1;  # Link tussen eth 1 RWgemhuis1 en 2.
     32$config{'sis1'}=sprintf <<ED1;
     33COMMENT=Link tussen eth 1 RWgemhuis1 en 2.
    3234TYPE=ethernet
    3335IP=172.16.1.242/30
     
    4042ED1
    4143
    42 $config{'wi0'}=sprintf <<EW0;  # link naar Node Struyk Verwo
     44$config{'wi0'}=sprintf <<EW0;
     45COMMENT=link naar Node Struyk Verwo
    4346TYPE=wireless
    4447IP=172.16.1.53/30
     
    5558EW0
    5659
    57 $config{'wi1'}=sprintf <<EW1;  # link naar Node WB rotary
     60$config{'wi1'}=sprintf <<EW1;
     61COMMENT=link naar Node WB rotary
    5862TYPE=wireless
    5963IP=172.16.2.26/30
     
    6367MODE=client
    6468ESSID=il-no.wbrotary.wleiden.net
    65 #CHANNEL=9
     69CHANNEL=9
    6670
    6771
  • nodes/CNodeRabo1/wleiden.conf

    r8172 r8261  
    1010$Y='464974';
    1111
    12 $config{'ath0'}=sprintf <<ATH0;  # ap oost
     12$config{'ath0'}=sprintf <<ATH0;
     13COMMENT=ap oost
    1314TYPE=wireless
    1415IP=$master_ip/26
     
    2122ATH0
    2223
    23 $config{'vr0'}=sprintf <<VR0;  # Ethernet naar Rabo2
     24$config{'vr0'}=sprintf <<VR0;
     25COMMENT=Ethernet naar Rabo2
    2426IP=172.19.137.65/30
    2527DHCP=no
     
    2830VR0
    2931
    30 $config{'vr1'}=sprintf <<VR1;  # a-link naar NodeHuub
     32$config{'vr1'}=sprintf <<VR1;
     33COMMENT=a-link naar NodeHuub
    3134TYPE=ethernet
    3235EXTRA_TYPE=eth2wifibridge
     
    3639SDESC=2huub
    3740DHCP=no
    38 #MODE=bridge ap
    39 #ESSID=il-z.rabo1.wleiden.net
    40 #CHANNEL=44
    41 #NSIP=172.16.4.10/29
    42 #NSMAC= 00:15:6D:70:53:6A
     41MODE=bridge ap
     42ESSID=il-z.rabo1.wleiden.net
     43CHANNEL=44
     44NSIP=172.16.4.10/29
     45NSMAC= 00:15:6D:70:53:6A
    4346VR1
    4447
    45 $config{'vr2'}=sprintf <<VR2; # Link naar SOM
     48$config{'vr2'}=sprintf <<VR2;
     49COMMENT=Link naar SOM
    4650TYPE=ethernet
    4751EXTRA_TYPE=eth2wifibridge
     
    5054SDESC=2som
    5155DHCP=no
    52 #MODE=bridge station
    53 #ESSID=il-w.som2.wleiden.net
    54 #CHANNEL=140
    55 #NS_IP=192.168.1.21
    56 #NSMAC=
     56MODE=bridge station
     57ESSID=il-w.som2.wleiden.net
     58CHANNEL=140
     59NS_IP=192.168.1.21
     60NSMAC=
    5761VR2
    5862
    59 $config{'ue0'}=sprintf <<UE0;  # Link naar AZC
     63$config{'ue0'}=sprintf <<UE0;
     64COMMENT=Link naar AZC
    6065TYPE=ethernet
    6166EXTRA_TYPE=eth2wifibridge
     
    6469SDESC=2azc
    6570DHCP=no
    66 #MODE=bridge ap
    67 #ESSID=il-w.rabo1.wleiden.net
    68 #CHANNEL=5
    69 #Bullet_IP=192.168.1.20
    70 #BulletMAC=00:15:6D:
     71MODE=bridge ap
     72ESSID=il-w.rabo1.wleiden.net
     73CHANNEL=5
     74Bullet_IP=192.168.1.20
     75BulletMAC=00:15:6D:
    7176UE0
    7277
    73 $config{'ue0:0'}=sprintf <<UE00;  # link naar Lebkov
     78$config{'ue0:0'}=sprintf <<UE00;
     79COMMENT=link naar Lebkov
    7480TYPE=wireless
    7581IP=172.16.1.17/30
     
    7985UE00
    8086
    81 $config{'ue1'}=sprintf <<UE1;  # Link naar Rudi
     87$config{'ue1'}=sprintf <<UE1;
     88COMMENT=Link naar Rudi
    8289TYPE=ethernet
    8390EXTRA_TYPE=eth2wifibridge
     
    8693SDESC=2rudi
    8794DHCP=no
    88 #MODE=bridge ap
    89 #ESSID=il-n.rabo1.wleiden.net
    90 #CHANNEL=13
    91 #Bullet_IP=192.168.1.20
    92 #BulletMAC=00:15:6D:
     95MODE=bridge ap
     96ESSID=il-n.rabo1.wleiden.net
     97CHANNEL=13
     98Bullet_IP=192.168.1.20
     99BulletMAC=00:15:6D:
    93100UE1
    94101
  • nodes/CNodeRabo2/wleiden.conf

    r8085 r8261  
    1010$Y='464974';
    1111
    12 $config{'ath0'}=sprintf <<ATH0;  # ap zuid
     12$config{'ath0'}=sprintf <<ATH0;
     13COMMENT=ap zuid
    1314TYPE=wireless
    1415IP=$master_ip/26
     
    2122ATH0
    2223
    23 $config{'vr0'}=sprintf <<VR0;  # Ethernet naar Rabo1
     24$config{'vr0'}=sprintf <<VR0;
     25COMMENT=Ethernet naar Rabo1
    2426IP=172.19.137.66/30
    2527DHCP=no
     
    2830VR0
    2931
    30 $config{'vr1'}=sprintf <<VR1;  # link naar NodeCope
     32$config{'vr1'}=sprintf <<VR1;
     33COMMENT=link naar NodeCope
    3134TYPE=ethernet
    3235EXTRA_TYPE=eth2wifibridge
     
    3639SDESC=2cope
    3740DHCP=no
    38 #MODE=bridge ap
    39 #ESSID=il-z.rabo2.wleiden.net
    40 #CHANNEL=132
    41 #NS_IP=192.168.1.20
    42 #NSMAC=
     41MODE=bridge ap
     42ESSID=il-z.rabo2.wleiden.net
     43CHANNEL=132
     44NS_IP=192.168.1.20
     45NSMAC=
    4346VR1
    4447
    45 $config{'vr2'}=sprintf <<VR2; # Link naar DirkLos2
     48$config{'vr2'}=sprintf <<VR2;
     49COMMENT=Link naar DirkLos2
    4650TYPE=ethernet
    4751EXTRA_TYPE=eth2wifibridge
     
    5054SDESC=2dirklos2
    5155DHCP=no
    52 #MODE=bridge station
    53 #ESSID=il-no.dirklos2.wleiden.net
    54 #CHANNEL=140
    55 #NS_IP=192.168.1.21
    56 #NSMAC=
     56MODE=bridge station
     57ESSID=il-no.dirklos2.wleiden.net
     58CHANNEL=140
     59NS_IP=192.168.1.21
     60NSMAC=
    5761VR2
  • nodes/CNodeRegenboog/wleiden.conf

    r8052 r8261  
    1111$Y='465975';
    1212
    13 $config{'ath0'}=sprintf <<ATH0;  # AP
     13$config{'ath0'}=sprintf <<ATH0;
     14COMMENT=AP
    1415TYPE=wireless
    1516IP=$master_ip/26
     
    2223ATH0
    2324
    24 $config{'sis0'}=sprintf <<SIS0;  # Ethernet
     25$config{'sis0'}=sprintf <<SIS0;
     26COMMENT=Ethernet
    2527TYPE=ethernet
    2628IP=172.21.152.65/28
     
    3032SIS0
    3133
    32 $config{'sis1'}=sprintf <<SIS1; # Link naar Rosmolen
     34$config{'sis1'}=sprintf <<SIS1;
     35COMMENT=Link naar Rosmolen
    3336TYPE=ethernet
    3437EXTRA_TYPE=eth2wifibridge
     
    3740IP=172.16.2.66/30
    3841DHCP=no
    39 #MODE=managed
    40 #ESSID=il-o.rosmolen.wleiden.net
    41 #CHANNEL=11
    42 #BulletMAC=
     42MODE=managed
     43ESSID=il-o.rosmolen.wleiden.net
     44CHANNEL=11
     45BulletMAC=
    4346SIS1
    4447
    45 $config{'wi0'}=sprintf <<EW0;  # link naar oost -> Polder
     48$config{'wi0'}=sprintf <<EW0;
     49COMMENT=link naar oost -> Polder
    4650TYPE=wireless
    4751DESC=Link naar oost
  • nodes/CNodeRichard/wleiden.conf

    r8142 r8261  
    1414$Y='453165';
    1515
    16 $config{'sis0'}=sprintf <<SIS0;  # Local ethernet to proxy
     16$config{'sis0'}=sprintf <<SIS0;
     17COMMENT=Local ethernet to proxy
    1718TYPE=ethernet
    1819IP=$master_ip/30
     
    2223SIS0
    2324
    24 $config{'wi0'}=sprintf <<WI0;  # Local ethernet to proxy
     25$config{'wi0'}=sprintf <<WI0;
     26COMMENT=Local ethernet to proxy
    2527TYPE=wireless
    2628IP=172.17.0.17/26
  • nodes/CNodeRick/wleiden.conf

    r8220 r8261  
    1313$Y='461987';
    1414
    15 $config{'sis0'}=sprintf <<SIS0; # Link to proxy interface
     15$config{'sis0'}=sprintf <<SIS0;
     16COMMENT=Link to proxy interface
    1617TYPE=ethernet
    1718IP=172.16.3.97/30
     
    2223
    2324
    24 $config{'ath0'}=sprintf <<ATH0;  # Internal Wireless
     25$config{'ath0'}=sprintf <<ATH0;
     26COMMENT=Internal Wireless
    2527TYPE=wireless
    2628MODE=master
     
    3941# Connected via NanoStation5
    4042# ESSID=il-zw.haagwijk.wleiden.net
    41 $config{'sis1'}=sprintf <<SIS1;  # Link naar Haagwijk
     43$config{'sis1'}=sprintf <<SIS1;
     44COMMENT=Link naar Haagwijk
    4245TYPE=ethernet
    4346IP=172.16.4.148/29
     
    4548DESC=Link naar Haagwijk
    4649SDESC=2haagwijk
    47 #MODE=bridge client wds
    48 #ESSID=il-zw.haagwijk.wleiden.net
    49 #NSMAC=
    50 #NS_IP=172.16.4.147/29
     50MODE=bridge client wds
     51ESSID=il-zw.haagwijk.wleiden.net
     52NSMAC=
     53NS_IP=172.16.4.147/29
    5154
    5255MODE=managed
  • nodes/CNodeRobijn/wleiden.conf

    r8190 r8261  
    1010$Y='463333';
    1111
    12 $config{'ue0'}=sprintf <<UE0;  # Ethernet
     12$config{'ue0'}=sprintf <<UE0;
     13COMMENT=Ethernet
    1314TYPE=ethernet
    1415IP=172.20.8.65/28
     
    1819UE0
    1920
    20 $config{'ath0'}=sprintf <<ATH0;  # omni
     21$config{'ath0'}=sprintf <<ATH0;
     22COMMENT=omni
    2123TYPE=wireless
    2224IP=$master_ip/26
     
    2931ATH0
    3032
    31 $config{'vr0'}=sprintf <<VR0;  # A link naar Vosko via nanostation
     33$config{'vr0'}=sprintf <<VR0;
     34COMMENT=A link naar Vosko via nanostation
    3235TYPE=ethernet
    3336EXTRA_TYPE=eth2wifibridge
     
    3639SDESC=2vosko
    3740DHCP=no
    38 #MODE=managed
    39 #ESSID=il-w.vosko.wleiden.net
    40 #NS_IP=172.16.4.115/29
    41 #NSMAC=00:15:6D:F2:39:37
     41MODE=managed
     42ESSID=il-w.vosko.wleiden.net
     43NS_IP=172.16.4.115/29
     44NSMAC=00:15:6D:F2:39:37
    4245VR0
    4346
    44 $config{'vr1'}=sprintf <<VR1;   # A Link naar Unigor via nanostation
     47$config{'vr1'}=sprintf <<VR1;
     48COMMENT=A Link naar Unigor via nanostation
    4549TYPE=ethernet
    4650EXTRA_TYPE=eth2wifibridge
     
    4953SDESC=2unigorA
    5054DHCP=no
    51 #NS_IP=192.168.1.21
    52 #NSMAC=00:15:6D:F2:39:44
    53 #MODE=managed
    54 #ESSID=ilA-z.unigor.wleiden.net
     55NS_IP=192.168.1.21
     56NSMAC=00:15:6D:F2:39:44
     57MODE=managed
     58ESSID=ilA-z.unigor.wleiden.net
    5559VR1
    5660
    57 $config{'vr2'}=sprintf <<VR2; # A Link naar AJSoft via nanostation   
     61$config{'vr2'}=sprintf <<VR2;
     62COMMENT=A Link naar AJSoft via nanostation   
    5863TYPE=ethernet
    5964EXTRA_TYPE=eth2wifibridge
     
    6267SDESC=2ajsoft
    6368DHCP=no
    64 #MODE=managed
    65 #ESSID=il-nw.ajsoft1.wleiden.net
    66 #NS_IP=192.168.1.21
    67 #NSMAC=00:15:6D:F2:38:07
     69MODE=managed
     70ESSID=il-nw.ajsoft1.wleiden.net
     71NS_IP=192.168.1.21
     72NSMAC=00:15:6D:F2:38:07
    6873VR2
    6974
  • nodes/CNodeRoomburgh1/wleiden.conf

    r8166 r8261  
    1111$Y='462890';
    1212
    13 $config{'ath0'}=sprintf <<ATH0;  # ap noordzijde
     13$config{'ath0'}=sprintf <<ATH0;
     14COMMENT=ap noordzijde
    1415TYPE=wireless
    1516IP=$master_ip/26
     
    2223ATH0
    2324
    24 $config{'vr0'}=sprintf <<VR0; #link naar ROC
     25$config{'vr0'}=sprintf <<VR0;
     26COMMENT=link naar ROC
    2527TYPE=ethernet
    2628EXTRA_TYPE=eth2wifibridge
     
    3032SDESC=2
    3133DHCP=no
    32 #MODE=bridge ap
    33 #ESSID=il-wzw.roomburgh2.wleiden.net
    34 #CHANNEL=100
    35 #NS_IP=192.168.1.20
    36 #NSMAC=00:15:6D:EA:F0:38
     34MODE=bridge ap
     35ESSID=il-wzw.roomburgh2.wleiden.net
     36CHANNEL=100
     37NS_IP=192.168.1.20
     38NSMAC=00:15:6D:EA:F0:38
    3739VR0
    3840
    39 $config{'vr1'}=sprintf <<VR1; # link naar Cetim1
     41$config{'vr1'}=sprintf <<VR1;
     42COMMENT=link naar Cetim1
    4043TYPE=ethernet
    4144EXTRA_TYPE=eth2wifibridge
     
    4447SDESC=2cetim1
    4548DHCP=no
    46 #MODE=managed
    47 #ESSID=il-zo.cetim1.wleiden.net
    48 #CHANNEL=132
    49 #NS_IP=192.168.1.21
    50 #NSMAC=00:15:6D:EA:EF:87
     49MODE=managed
     50ESSID=il-zo.cetim1.wleiden.net
     51CHANNEL=132
     52NS_IP=192.168.1.21
     53NSMAC=00:15:6D:EA:EF:87
    5154VR1
    5255
    53 $config{'vr2'}=sprintf <<VR2; #link naar Rosmolen
     56$config{'vr2'}=sprintf <<VR2;
     57COMMENT=link naar Rosmolen
    5458TYPE=ethernet
    5559EXTRA_TYPE=eth2wifibridge
     
    5862IP=172.16.3.73/29
    5963DHCP=no
    60 #MODE=bridge ap
    61 #ESSID=il-nnw.roomburgh1.wleiden.net
    62 #CHANNEL=124
     64MODE=bridge ap
     65ESSID=il-nnw.roomburgh1.wleiden.net
     66CHANNEL=124
    6367
    6468VR2
    6569
    66 $config{'ue0'}=sprintf <<UE0;  # Ethernet lokaal en Roomburgh2,3
     70$config{'ue0'}=sprintf <<UE0;
     71COMMENT=Ethernet lokaal en Roomburgh2,3
    6772TYPE=ethernet
    6873IP=172.18.49.71/28
  • nodes/CNodeRoomburgh2/wleiden.conf

    r8098 r8261  
    88$Y='462905';
    99
    10 $config{'ath0'}=sprintf <<ATH0;  # ap zuidzijde
     10$config{'ath0'}=sprintf <<ATH0;
     11COMMENT=ap zuidzijde
    1112TYPE=wireless
    1213IP=$master_ip/26
     
    1920ATH0
    2021
    21 $config{'vr0'}=sprintf <<VR0;  # Ethernet to local subnet
     22$config{'vr0'}=sprintf <<VR0;
     23COMMENT=Ethernet to local subnet
    2224TYPE=ethernet
    2325IP=172.18.49.72/28
     
    2729VR0
    2830
    29 $config{'vr1'}=sprintf <<VR1; # tijdelijke link naar Leythenrode
     31$config{'vr1'}=sprintf <<VR1;
     32COMMENT=tijdelijke link naar Leythenrode
    3033TYPE=ethernet
    3134EXTRA_TYPE=eth2wifibridge
     
    3437SDESC=2leythenrode
    3538DHCP=no
    36 #MODE=bridge managed
    37 #ESSID=il-zw.leythenrode.wleiden.net
    38 #CHANNEL=44
    39 #NS_IP=192.168.1.21
    40 #NSMAC=00:15:6D:EA:F0:7B
     39MODE=bridge managed
     40ESSID=il-zw.leythenrode.wleiden.net
     41CHANNEL=44
     42NS_IP=192.168.1.21
     43NSMAC=00:15:6D:EA:F0:7B
    4144VR1
    4245
    43 $config{'vr2'}=sprintf <<VR2; # link naar Lorentzhof
     46$config{'vr2'}=sprintf <<VR2;
     47COMMENT=link naar Lorentzhof
    4448TYPE=ethernet
    4549EXTRA_TYPE=eth2wifibridge
     
    4751DESC=Link naar Lorentzhof
    4852SDESC=2lorentzhof
    49 #MODE=bridge ap
    50 #ESSID=il-zw.roomburgh2.wleiden.net
    51 #CHANNEL=116
    52 #NS_IP=192.168.1.20
    53 #NSMAC=00:15:6D:EB:EF:A7
     53MODE=bridge ap
     54ESSID=il-zw.roomburgh2.wleiden.net
     55CHANNEL=116
     56NS_IP=192.168.1.20
     57NSMAC=00:15:6D:EB:EF:A7
    5458DHCP=no
    5559VR2
  • nodes/CNodeRoomburgh3/wleiden.conf

    r8171 r8261  
    1111$Y='462890';
    1212
    13 $config{'ath0'}=sprintf <<AT0;  # link naar ...
     13$config{'ath0'}=sprintf <<AT0;
     14COMMENT=link naar ...
    1415TYPE=wireless
    1516IP=172.16.3.161/30
     
    2223AT0
    2324
    24 $config{'vr0'}=sprintf <<VR0;  # Ethernet to local subnet with PoE
     25$config{'vr0'}=sprintf <<VR0;
     26COMMENT=Ethernet to local subnet with PoE
    2527TYPE=ethernet
    2628IP=172.18.49.73/28
     
    3032VR0
    3133
    32 $config{'vr1'}=sprintf <<VR1; # a-link to DeClerq via Nanostation5
     34$config{'vr1'}=sprintf <<VR1;
     35COMMENT=a-link to DeClerq via Nanostation5
    3336TYPE=ethernet
    3437EXTRA_TYPE=eth2wifibridge
     
    3740SDESC=2DeClerq
    3841DHCP=no
    39 #MODE=managed
    40 #ESSID=il-w.declercq.wleiden.net
    41 #CHANNEL=52
    42 #NS_IP=192.168.1.21
    43 #NSMAC=00:15:6D:BD:69:30
     42MODE=managed
     43ESSID=il-w.declercq.wleiden.net
     44CHANNEL=52
     45NS_IP=192.168.1.21
     46NSMAC=00:15:6D:BD:69:30
    4447VR1
    4548
    46 $config{'vr2'}=sprintf <<VR2; # link to Zijloever via Nanostation5
     49$config{'vr2'}=sprintf <<VR2;
     50COMMENT=link to Zijloever via Nanostation5
    4751TYPE=ethernet
    4852EXTRA_TYPE=eth2wifibridge
     
    5054DESC=ethernet to interlink noord-2
    5155SDESC=2Zijloever
    52 #MODE=master
    53 #ESSID=il-n.roomburgh3.wleiden.net
    54 #CHANNEL=44
    55 #NS_IP=192.168.1.20
    56 #NSMAC=00:15:6D:EA:F0:28
     56MODE=master
     57ESSID=il-n.roomburgh3.wleiden.net
     58CHANNEL=44
     59NS_IP=192.168.1.20
     60NSMAC=00:15:6D:EA:F0:28
    5761VR2
    5862
  • nodes/CNodeRosmolen/wleiden.conf

    r8166 r8261  
    1111$Y='465831';
    1212
    13 $config{'ath0'}=sprintf <<ATH0;   # AP
     13$config{'ath0'}=sprintf <<ATH0;
     14COMMENT=AP
    1415TYPE=wireless
    1516IP=$master_ip/24
     
    2223ATH0
    2324
    24 $config{'vr0'}=sprintf <<VR0; # a-link naar Broekplein
     25$config{'vr0'}=sprintf <<VR0;
     26COMMENT=a-link naar Broekplein
    2527TYPE=ethernet
    2628EXTRA_TYPE=eth2wifibridge
     
    2931SDESC=2Broekplein
    3032DHCP=no
    31 #MODE=managed
    32 #ESSID=il-z.broekplein.wleiden.net
    33 #CHANNEL=36
    34 #NSMAC=
     33MODE=managed
     34ESSID=il-z.broekplein.wleiden.net
     35CHANNEL=36
     36NSMAC=
    3537VR0
    3638
    37 $config{'vr1'}=sprintf <<VR1; #link naar Roomburgh1
     39$config{'vr1'}=sprintf <<VR1;
     40COMMENT=link naar Roomburgh1
    3841TYPE=ethernet
    3942EXTRA_TYPE=eth2wifibridge
     
    4245IP=172.16.3.44/29
    4346DHCP=no
    44 #Nano ip 172.16.3.43
    45 #MODE=managed
    46 #ESSID=il-nnw.roomburgh1.wleiden.net
    47 #CHANNEL=124
    48 #NSMAC=00:15:6D:EA:F0:62
    49 #NSIP=192.168.1.21
     47Nano ip 172.16.3.43
     48MODE=managed
     49ESSID=il-nnw.roomburgh1.wleiden.net
     50CHANNEL=124
     51NSMAC=00:15:6D:EA:F0:62
     52NSIP=192.168.1.21
    5053VR1
    5154
    52 $config{'vr2'}=sprintf <<VR2; #link naar Regenboog
     55$config{'vr2'}=sprintf <<VR2;
     56COMMENT=link naar Regenboog
    5357TYPE=ethernet
    5458EXTRA_TYPE=eth2wifibridge
     
    5761IP=172.16.2.65/30
    5862DHCP=no
    59 #MODE=ap
    60 #ESSID=il-o.rosmolen.wleiden.net
    61 #CHANNEL=11
    62 #BulletMAC=
     63MODE=ap
     64ESSID=il-o.rosmolen.wleiden.net
     65CHANNEL=11
     66BulletMAC=
    6367VR2
    6468
    65 $config{'ue0'}=sprintf <<UE0;  # Ethernet
     69$config{'ue0'}=sprintf <<UE0;
     70COMMENT=Ethernet
    6671TYPE=ethernet
    6772IP=172.21.168.65/28
     
    7176UE0
    7277
    73 $config{'ue1'}=sprintf <<UE1;  # Link naar Rudi
     78$config{'ue1'}=sprintf <<UE1;
     79COMMENT=Link naar Rudi
    7480TYPE=ethernet
    7581EXTRA_TYPE=eth2wifibridge
     
    7884SDESC=2Rudi
    7985DHCP=no
    80 #MODE=bridge ap
    81 #ESSID=il-nw.rosmolen.wleiden.net
    82 #CHANNEL=3
    83 #BulletMAC=00:15:6D:
     86MODE=bridge ap
     87ESSID=il-nw.rosmolen.wleiden.net
     88CHANNEL=3
     89BulletMAC=00:15:6D:
    8490UE1
    8591
  • nodes/CNodeRudi/wleiden.conf

    r8148 r8261  
    1515$Y='466050';
    1616
    17 $config{'ep0'}=sprintf <<EP0;  # eth
     17$config{'ep0'}=sprintf <<EP0;
     18COMMENT=eth
    1819TYPE=ethernet
    1920IP=172.23.0.65/29
    2021DESC=Ethernet naar Xlexit
    2122SDESC=eth
    22 #DHCP=68-70
     23DHCP=68-70
    2324DHCP=no
    2425EP0
    2526
    26 $config{'wi0'}=sprintf <<EW0;  # OMNI
     27$config{'wi0'}=sprintf <<EW0;
     28COMMENT=OMNI
    2729TYPE=wireless
    2830IP=$master_ip/26
     
    3537EW0
    3638
    37 $config{'wi1'}=sprintf <<EW1;  # link naar Rabo
     39$config{'wi1'}=sprintf <<EW1;
     40COMMENT=link naar Rabo
    3841TYPE=wireless
    3942IP=172.16.3.126/30
  • nodes/CNodeRund/wleiden.conf

    r7660 r8261  
    2020$LOKATIE='IP69 kast aan antennemast, PoE vanuit voorkamer en meterkast.';
    2121
    22 $config{'sis0'}=sprintf <<ED0;  # Ethernet
     22$config{'sis0'}=sprintf <<ED0;
     23COMMENT=Ethernet
    2324TYPE=ethernet
    2425IP=172.17.160.65/28
     
    3435ED0
    3536
    36 $config{'wi0'}=sprintf <<EOM;  # AP NW
     37$config{'wi0'}=sprintf <<EOM;
     38COMMENT=AP NW
    3739TYPE=wireless
    3840IP=$master_ip/26
     
    4143
    4244
    43 #DHCP=no
     45DHCP=no
    4446DHCP=10-60
    4547
     
    5456EOM
    5557
    56 $config{'wi2'}=sprintf <<EOM; # Link naar vosko2
     58$config{'wi2'}=sprintf <<EOM;
     59COMMENT=Link naar vosko2
    5760TYPE=wireless
    5861IP=172.16.0.177/30
     
    6467ESSID=il-no.vosko2.wleiden.net
    6568
    66 #CHANNEL=13
     69CHANNEL=13
    6770
    6871
  • nodes/CNodeRustenborch/wleiden.conf

    r8115 r8261  
    1010$Y='466407';
    1111
    12 $config{'ath0'}=sprintf <<ATH0;  #  Ap
     12$config{'ath0'}=sprintf <<ATH0;
     13COMMENT=Ap
    1314TYPE=wireless
    1415IP=$master_ip/26
     
    2122ATH0
    2223
    23 $config{'vr0'}=sprintf <<VR0;  # Ethernet
     24$config{'vr0'}=sprintf <<VR0;
     25COMMENT=Ethernet
    2426TYPE=ethernet
    2527IP=172.23.24.65/28
     
    2931VR0
    3032
    31 $config{'vr1'}=sprintf <<VR1; # Link Lijtweg2
     33$config{'vr1'}=sprintf <<VR1;
     34COMMENT=Link Lijtweg2
    3235TYPE=ethernet
    3336EXTRA_TYPE=eth2wifibridge
     
    3639DESC=Link naar Lijtweg2
    3740SDESC=2lijtweg2
    38 #MODE=bridge station
    39 #ESSID=il-w.lijtweg2.wleiden.net
    40 #CHANNEL=116
    41 #NS_IP=192.168.1.21
    42 #NSMAC=00:15:6D:
     41MODE=bridge station
     42ESSID=il-w.lijtweg2.wleiden.net
     43CHANNEL=116
     44NS_IP=192.168.1.21
     45NSMAC=00:15:6D:
    4346VR1
    4447
    45 $config{'vr2'}=sprintf <<VR2;  # Link naar UniGorN
     48$config{'vr2'}=sprintf <<VR2;
     49COMMENT=Link naar UniGorN
    4650TYPE=ethernet
    4751EXTRA_TYPE=eth2wifibridge
     
    5054DESC=Link naar unigorn
    5155SDESC=2unigorn
    52 #MODE=bridge station
    53 #ESSID=il-o.unigorn.wleiden.net
    54 #CHANNEL=104
    55 #NSMAC=00:15:6D:
    56 #NSIP=192.168.1.21
     56MODE=bridge station
     57ESSID=il-o.unigorn.wleiden.net
     58CHANNEL=104
     59NSMAC=00:15:6D:
     60NSIP=192.168.1.21
    5761VR2
    5862 
    59 $config{'ue0'}=sprintf <<UE0;  # link naar Unused
     63$config{'ue0'}=sprintf <<UE0;
     64COMMENT=link naar Unused
    6065TYPE=ethernet
    6166EXTRA_TYPE=eth2wifibridge
     
    6469DESC=Link naar Unused
    6570SDESC=2unused
    66 #MODE=master
    67 #ESSID=il-no.rustenborch.wleiden.net
    68 #CHANNEL=36
     71MODE=master
     72ESSID=il-no.rustenborch.wleiden.net
     73CHANNEL=36
    6974UE0
    7075
  • nodes/CNodeSHFortis/wleiden.conf

    r7657 r8261  
    1919#$AGGREGATE=22;
    2020
    21 $config{'sis0'}=sprintf <<ED0;  # eth
     21$config{'sis0'}=sprintf <<ED0;
     22COMMENT=eth
    2223TYPE=ethernet
    2324IP=172.28.136.65/29
     
    2627SDESC=eth
    2728
    28 #DHCP=68-70
     29DHCP=68-70
    2930DHCP=no
    3031
     
    3435ED0
    3536
    36 $config{'wi0'}=sprintf <<EW0;  # OMNI
     37$config{'wi0'}=sprintf <<EW0;
     38COMMENT=OMNI
    3739TYPE=wireless
    3840IP=$master_ip/26
     
    5355
    5456
    55 $config{'wi1'}=sprintf <<EW1;  # link naar Koster
     57$config{'wi1'}=sprintf <<EW1;
     58COMMENT=link naar Koster
    5659TYPE=wireless
    5760IP=172.28.1.130/30
     
    7174
    7275
    73 $config{'wi2'}=sprintf <<EW2;  # link naar PPFortis
     76$config{'wi2'}=sprintf <<EW2;
     77COMMENT=link naar PPFortis
    7478TYPE=wireless
    7579IP=172.28.1.138/30
  • nodes/CNodeSOM1/wleiden.conf

    r8041 r8261  
    1010$status='up';
    1111
    12 $config{'ath0'}=sprintf <<ATH0;  # ap noord
     12$config{'ath0'}=sprintf <<ATH0;
     13COMMENT=ap noord
    1314TYPE=wireless
    1415IP=$master_ip/26
     
    2122ATH0
    2223
    23 $config{'vr0'}=sprintf <<VR0;  # Ethernet naar SOM2
     24$config{'vr0'}=sprintf <<VR0;
     25COMMENT=Ethernet naar SOM2
    2426TYPE=ethernet
    2527IP=172.16.3.137/30
     
    2931VR0
    3032
    31 $config{'vr1'}=sprintf <<VR1;  # Link naar Broekplein
     33$config{'vr1'}=sprintf <<VR1;
     34COMMENT=Link naar Broekplein
    3235TYPE=ethernet
    3336EXTRA_TYPE=eth2wifibridge
     
    3639SDESC=2broekplein
    3740DHCP=no
    38 #MODE=bridge ap
    39 #ESSID=il-n.som1.wleiden.net
    40 #CHANNEL=132
    41 #NSMAC=
     41MODE=bridge ap
     42ESSID=il-n.som1.wleiden.net
     43CHANNEL=132
     44NSMAC=
    4245VR1
    4346
    44 $config{'vr2'}=sprintf <<VR2;  # Link naar Stadhuis
     47$config{'vr2'}=sprintf <<VR2;
     48COMMENT=Link naar Stadhuis
    4549TYPE=ethernet
    4650EXTRA_TYPE=eth2wifibridge
     
    4953SDESC=2Stadhuis
    5054DHCP=no
    51 #MODE=bridge ap
    52 #ESSID=il-z.som1.wleiden.net
    53 #CHANNEL=52
    54 #NSMAC=
     55MODE=bridge ap
     56ESSID=il-z.som1.wleiden.net
     57CHANNEL=52
     58NSMAC=
    5559VR2
    5660
  • nodes/CNodeSOM2/wleiden.conf

    r8218 r8261  
    1010$status='up';
    1111
    12 $config{'ath0'}=sprintf <<ATH0;  # ap zuidoost
     12$config{'ath0'}=sprintf <<ATH0;
     13COMMENT=ap zuidoost
    1314TYPE=wireless
    1415IP=$master_ip/26
     
    2122ATH0
    2223
    23 $config{'ath0:0'}=sprintf <<ATH00;  # link Spoortje
     24$config{'ath0:0'}=sprintf <<ATH00;
     25COMMENT=link Spoortje
    2426TYPE=wireless
    2527DESC=Link naar Spoortje
     
    2931ATH00
    3032
    31 $config{'ath0:1'}=sprintf <<ATH01;  # link Zijloever
     33$config{'ath0:1'}=sprintf <<ATH01;
     34COMMENT=link Zijloever
    3235TYPE=wireless
    3336IP=172.16.1.61/30
     
    3740ATH01
    3841
    39 $config{'ath0:2'}=sprintf <<ATH02;  # link Houtmarkt
     42$config{'ath0:2'}=sprintf <<ATH02;
     43COMMENT=link Houtmarkt
    4044TYPE=wireless
    4145IP=172.16.0.49/30
     
    4549ATH02
    4650
    47 $config{'ath0:3'}=sprintf <<ATH03;  # link NodeVeldBies
     51$config{'ath0:3'}=sprintf <<ATH03;
     52COMMENT=link NodeVeldBies
    4853TYPE=wireless
    4954IP=172.16.0.121/30
     
    5358ATH03
    5459
    55 $config{'ath0:4'}=sprintf <<ATH04;  # link NodeZwet
     60$config{'ath0:4'}=sprintf <<ATH04;
     61COMMENT=link NodeZwet
    5662TYPE=wireless
    5763IP=172.16.4.137/29
     
    6167ATH04
    6268
    63 $config{'vr0'}=sprintf <<VR0;  # Ethernet naar SOM1
     69$config{'vr0'}=sprintf <<VR0;
     70COMMENT=Ethernet naar SOM1
    6471TYPE=ethernet
    6572IP=172.16.3.138/30
     
    6976VR0
    7077
    71 $config{'vr1'}=sprintf <<VR1;  # Link naar Rabo
     78$config{'vr1'}=sprintf <<VR1;
     79COMMENT=Link naar Rabo
    7280TYPE=ethernet
    7381EXTRA_TYPE=eth2wifibridge
     
    7684SDESC=2Rabo
    7785DHCP=no
    78 #MODE=bridge ap
    79 #ESSID=il-w.som2.wleiden.net
    80 #CHANNEL=140
    81 #NSMAC=
     86MODE=bridge ap
     87ESSID=il-w.som2.wleiden.net
     88CHANNEL=140
     89NSMAC=
    8290VR1
    8391
    84 $config{'vr2'}=sprintf <<VR2; # link naar Graficall
     92$config{'vr2'}=sprintf <<VR2;
     93COMMENT=link naar Graficall
    8594TYPE=ethernet
    8695EXTRA_TYPE=eth2wifibridge
     
    8998SDESC=2Graficall
    9099DHCP=no
    91 #MODE=bridge station
    92 #ESSID=il-nw.graficall.wleiden.net
    93 #CHANNEL=60
    94 #NSMAC=
     100MODE=bridge station
     101ESSID=il-nw.graficall.wleiden.net
     102CHANNEL=60
     103NSMAC=
    95104VR2
    96105
  • nodes/CNodeSpoortje/wleiden.conf

    r7657 r8261  
    1616
    1717##########################ethernet######################
    18 $config{'ep0'}=sprintf <<EP0;  # Ethernet 
     18$config{'ep0'}=sprintf <<EP0;
     19COMMENT=Ethernet 
    1920TYPE=ethernet
    2021DESC=ethernet naar bibliotheek     #Airport : transparant
     
    2526
    2627#########################eerste wireless kaart#######################
    27 $config{'wi0'}=sprintf <<EW0;   # Omni
     28$config{'wi0'}=sprintf <<EW0;
     29COMMENT=Omni
    2830TYPE=wireless
    2931DESC=omni voor de buurt
  • nodes/CNodeStadhuis/wleiden.conf

    r8196 r8261  
    1414
    1515# configuratie van ethernetpoort via usb-ethernet adapter
    16 $config{'ue0'}=sprintf <<UE0;  # lokaal ethernet via usb-lan adapter
     16$config{'ue0'}=sprintf <<UE0;
     17COMMENT=lokaal ethernet via usb-lan adapter
    1718TYPE=ethernet
    1819IP=$master_ip/26
     
    2223UE0
    2324
    24 $config{'ue0:0'}=sprintf <<UE00; # management interface via usb-lan adapter
     25$config{'ue0:0'}=sprintf <<UE00;
     26COMMENT=management interface via usb-lan adapter
    2527TYPE=ethernet
    2628IP=172.16.3.245/30
     
    3032UE00
    3133
    32 $config{'vr0'}=sprintf <<VR0; # link to SOM1
     34$config{'vr0'}=sprintf <<VR0;
     35COMMENT=link to SOM1
    3336TYPE=ethernet
    3437EXTRA_TYPE=eth2wifibridge
     
    3740DESC=ethernet to interlink noord
    3841SDESC=2SOM1
    39 #MODE=managed
    40 #ESSID=il-z.som1.wleiden.net
    41 #CHANNEL=52
    42 #DISTANCE=3 km
    43 #NSMAC=
     42MODE=managed
     43ESSID=il-z.som1.wleiden.net
     44CHANNEL=52
     45DISTANCE=3 km
     46NSMAC=
    4447VR0
    4548
    46 $config{'vr1'}=sprintf <<VR1; # AP north east via Bullet2
     49$config{'vr1'}=sprintf <<VR1;
     50COMMENT=AP north east via Bullet2
    4751TYPE=ethernet
    4852EXTRA_TYPE=eth2wifibridge
     
    5357VR1
    5458
    55 $config{'vr1:0'}=sprintf <<VR10; # ethernet to mgmt interface
     59$config{'vr1:0'}=sprintf <<VR10;
     60COMMENT=ethernet to mgmt interface
    5661TYPE=ethernet
    5762IP=172.16.3.225/30
     
    5964SDESC=manageB2
    6065DHCP=no
    61 #MODE=master
    62 #ESSID=ap-WirelessLeiden-stadhuis-no
    63 #CHANNEL=7
    64 #DISTANCE=
     66MODE=master
     67ESSID=ap-WirelessLeiden-stadhuis-no
     68CHANNEL=7
     69DISTANCE=
    6570VR10
    6671
    67 $config{'vr2'}=sprintf <<VR2; # a-link east via nanostation
     72$config{'vr2'}=sprintf <<VR2;
     73COMMENT=a-link east via nanostation
    6874TYPE=ethernet
    6975EXTRA_TYPE=eth2wifibridge
     
    7480VR2
    7581
    76 $config{'vr2:0'}=sprintf <<VR20; # to nanostation east management interface
     82$config{'vr2:0'}=sprintf <<VR20;
     83COMMENT=to nanostation east management interface
    7784TYPE=ethernet
    7885IP=172.16.3.233/30
     
    8087SDESC=manageNS5
    8188DHCP=no
    82 #MODE=master
    83 #ESSID=il-o.stadhuis.wleiden.net
    84 #CHANNEL=36
    85 #DISTANCE=
     89MODE=master
     90ESSID=il-o.stadhuis.wleiden.net
     91CHANNEL=36
     92DISTANCE=
    8693VR20
    8794
    88 $config{'vr3'}=sprintf <<VR3; # a-link south-east via nanostation
     95$config{'vr3'}=sprintf <<VR3;
     96COMMENT=a-link south-east via nanostation
    8997TYPE=ethernet
    9098EXTRA_TYPE=eth2wifibridge
     
    95103VR3
    96104
    97 $config{'vr3:0'}=sprintf <<VR30; # ethernet to nanostation mgmt interface
     105$config{'vr3:0'}=sprintf <<VR30;
     106COMMENT=ethernet to nanostation mgmt interface
    98107TYPE=ethernet
    99108IP=172.16.3.237/30
     
    101110SDESC=manageNS5
    102111DHCP=no
    103 #MODE=master
    104 #ESSID=il-zo.stadhuis.wleiden.net
    105 #CHANNEL=44
    106 #DISTANCE=0.5 km
     112MODE=master
     113ESSID=il-zo.stadhuis.wleiden.net
     114CHANNEL=44
     115DISTANCE=0.5 km
    107116VR30
    108117
    109 $config{'sis0'}=sprintf <<SIS0; # AP-zuid via Bullet2
     118$config{'sis0'}=sprintf <<SIS0;
     119COMMENT=AP-zuid via Bullet2
    110120TYPE=ethernet
    111121EXTRA_TYPE=eth2wifibridge
     
    116126SIS0
    117127
    118 $config{'sis0:0'}=sprintf <<SIS00; # to Bullet2 management interface
     128$config{'sis0:0'}=sprintf <<SIS00;
     129COMMENT=to Bullet2 management interface
    119130TYPE=ethernet
    120131IP=172.16.3.241/30
     
    122133SDESC=manageB2
    123134DHCP=no
    124 #MODE=master
    125 #ESSID=ap-WirelessLeiden-stadhuis-z
    126 #CHANNEL=4
    127 #DISTANCE=
     135MODE=master
     136ESSID=ap-WirelessLeiden-stadhuis-z
     137CHANNEL=4
     138DISTANCE=
    128139SIS00
    129140
    130 $config{'sis1'}=sprintf <<SIS1; # a-link west via Nanostation5
     141$config{'sis1'}=sprintf <<SIS1;
     142COMMENT=a-link west via Nanostation5
    131143TYPE=ethernet
    132144EXTRA_TYPE=eth2wifibridge
     
    137149SIS1
    138150
    139 $config{'sis1:0'}=sprintf <<SIS10; # to nanostation mgmt interface
     151$config{'sis1:0'}=sprintf <<SIS10;
     152COMMENT=to nanostation mgmt interface
    140153TYPE=ethernet
    141154IP=172.16.3.201/30
     
    143156SDESC=manageNS5
    144157DHCP=no
    145 #MODE=managed
    146 #ESSID=il-o.vosko3.wleiden.net
    147 #CHANNEL=108
    148 #DISTANCE=0.5 km
     158MODE=managed
     159ESSID=il-o.vosko3.wleiden.net
     160CHANNEL=108
     161DISTANCE=0.5 km
    149162SIS10
    150163
    151 $config{'sis2'}=sprintf <<SIS2; # AP west via Bullet2
     164$config{'sis2'}=sprintf <<SIS2;
     165COMMENT=AP west via Bullet2
    152166TYPE=ethernet
    153167EXTRA_TYPE=eth2wifibridge
     
    158172SIS2
    159173
    160 $config{'sis2:0'}=sprintf <<SIS20; # to management interface
     174$config{'sis2:0'}=sprintf <<SIS20;
     175COMMENT=to management interface
    161176TYPE=ethernet
    162177IP=172.16.3.205/30
     
    164179SDESC=manageB2
    165180DHCP=no
    166 #MODE=master
    167 #ESSID=ap-w.stadhuis.wleiden.net
    168 #CHANNEL=10
    169 #DISTANCE=
     181MODE=master
     182ESSID=ap-w.stadhuis.wleiden.net
     183CHANNEL=10
     184DISTANCE=
    170185SIS20
    171186
    172 $config{'sis2:1'}=sprintf <<SIS21; # to Huub
     187$config{'sis2:1'}=sprintf <<SIS21;
     188COMMENT=to Huub
    173189TYPE=ethernet
    174190IP=172.16.3.209/30
     
    177193SIS21
    178194
    179 $config{'sis3'}=sprintf <<SIS3; # a-link north-west via Nanostation5
     195$config{'sis3'}=sprintf <<SIS3;
     196COMMENT=a-link north-west via Nanostation5
    180197TYPE=ethernet
    181198EXTRA_TYPE=eth2wifibridge
     
    186203SIS3
    187204
    188 $config{'sis3:0'}=sprintf <<SIS30; # ethernet to nanostation mgmt interface
     205$config{'sis3:0'}=sprintf <<SIS30;
     206COMMENT=ethernet to nanostation mgmt interface
    189207TYPE=ethernet
    190208IP=172.16.3.217/30
     
    192210SDESC=manageNS5
    193211DHCP=no
    194 #MODE=master
    195 #ESSID=il-nw.stadhuis.wleiden.net
    196 #CHANNEL=116
    197 #DISTANCE=1.8 km
     212MODE=master
     213ESSID=il-nw.stadhuis.wleiden.net
     214CHANNEL=116
     215DISTANCE=1.8 km
    198216SIS30
    199217
    200 $config{'sis3:1'}=sprintf <<SIS31; # extra a-link to DirkLos2
     218$config{'sis3:1'}=sprintf <<SIS31;
     219COMMENT=extra a-link to DirkLos2
    201220TYPE=ethernet
    202221EXTRA_TYPE=eth2wifibridge
     
    207226SIS31
    208227
    209 $config{'sis3:2'}=sprintf <<SIS32; # extra a-link to LvLn2
     228$config{'sis3:2'}=sprintf <<SIS32;
     229COMMENT=extra a-link to LvLn2
    210230TYPE=ethernet
    211231EXTRA_TYPE=eth2wifibridge
  • nodes/CNodeThomas/wleiden.conf

    r8260 r8261  
    2020$Y='463474';
    2121
    22 $config{'sis0'}=sprintf <<ED0;  # Ethernet
     22$config{'sis0'}=sprintf <<ED0;
     23COMMENT=Ethernet
    2324TYPE=ethernet
    2425IP=172.17.48.65/29
     
    3233ED0
    3334
    34 $config{'wi0'}=sprintf <<EW0;  # OMNI
     35$config{'wi0'}=sprintf <<EW0;
     36COMMENT=OMNI
    3537TYPE=wireless
    3638IP=$master_ip/26
     
    5961MODE=managed
    6062ESSID=il-zo.vosko2.wleiden.net
    61 #CHANNEL=1
     63CHANNEL=1
    6264
    6365
     
    6769
    6870
    69 $config{'wi2'}=sprintf <<EW2;  # link naar IMI
     71$config{'wi2'}=sprintf <<EW2;
     72COMMENT=link naar IMI
    7073TYPE=wireless
    7174IP=172.16.0.82/30
     
    7679MODE=managed
    7780ESSID=il-no.imi.wleiden.net
    78 #CHANNEL=8
     81CHANNEL=8
    7982
    8083
  • nodes/CNodeUniGor/wleiden.conf

    r8209 r8261  
    1313$Y='464813';
    1414
    15 $config{'ath0'}=sprintf <<ATH0;  # AP Richting oost
     15$config{'ath0'}=sprintf <<ATH0;
     16COMMENT=AP Richting oost
    1617TYPE=wireless
    1718IP=$master_ip/26
     
    2425ATH0
    2526
    26 $config{'vr0'}=sprintf <<VR0;  # AP Richting zuid via Bullet 1
     27$config{'vr0'}=sprintf <<VR0;
     28COMMENT=AP Richting zuid via Bullet 1
    2729TYPE=ethernet
    2830IP=172.22.8.1/26
     
    3032SDESC=no
    3133DHCP=10-60
    32 #Bullet_IP=192.168.1.20
    33 #BulletMAC=
    34 #MODE=master
    35 #ESSID=ap-WirelessLeiden-Unigor-zuid
    36 #CHANNEL=7
     34Bullet_IP=192.168.1.20
     35BulletMAC=
     36MODE=master
     37ESSID=ap-WirelessLeiden-Unigor-zuid
     38CHANNEL=7
    3739VR0
    3840
    39 $config{'vr1'}=sprintf <<VR1;  # A link naar Cope via nanostation 1
     41$config{'vr1'}=sprintf <<VR1;
     42COMMENT=A link naar Cope via nanostation 1
    4043TYPE=ethernet
    4144IP=172.16.4.33/30
     
    4346SDESC=2copeA
    4447DHCP=no
    45 #ESSID=il-Z0.unigor.wleiden.net
    46 #CHANNEL=128
     48ESSID=il-Z0.unigor.wleiden.net
     49CHANNEL=128
    4750#mode 11a bridge master
    48 #IP nanostation 192.168.1.20
    49 #NSMAC=00:15:6D:F2:38:A0
     51NANO_IP=192.168.1.20
     52NSMAC=00:15:6D:F2:38:A0
    5053VR1
    5154
    52 $config{'vr1:0'}=sprintf <<VR10;  # A link naar LUMC
     55$config{'vr1:0'}=sprintf <<VR10;
     56COMMENT=A link naar LUMC
    5357TYPE=ethernet
    5458IP=172.16.4.81/29
     
    5862VR10
    5963
    60 $config{'vr2'}=sprintf <<VR2;  # A link naar Robijn via nanostation 2
     64$config{'vr2'}=sprintf <<VR2;
     65COMMENT=A link naar Robijn via nanostation 2
    6166TYPE=ethernet
    6267IP=172.16.4.37/30               
     
    6469SDESC=2robijnA
    6570DHCP=no
    66 #IP nanostation 192.168.1.20
    67 #NSMAC=00:15:6D:F2:38:BD
    68 #MODE=master
    69 #ESSID=ilA-z.unigor.wleiden.net
    70 #CHANNEL=104
     71NANO_IP=192.168.1.20
     72NSMAC=00:15:6D:F2:38:BD
     73MODE=master
     74ESSID=ilA-z.unigor.wleiden.net
     75CHANNEL=104
    7176VR2
    7277
    73 $config{'vr2:0'}=sprintf <<VR20;  # A Link naar Zwaluwak via nanostation 2
     78$config{'vr2:0'}=sprintf <<VR20;
     79COMMENT=A Link naar Zwaluwak via nanostation 2
    7480TYPE=ethernet
    7581IP=172.16.4.21/30
     
    7884VR20
    7985
    80 $config{'vr3'}=sprintf <<VR3;   # Link naar AZC via bullet 2
     86$config{'vr3'}=sprintf <<VR3;
     87COMMENT=Link naar AZC via bullet 2
    8188TYPE=ethernet
    8289IP=172.16.0.165/30
     
    8491SDESC=2azc
    8592DHCP=no
    86 #Bullet_IP=192.168.1.20
    87 #BulletMAC=
    88 #MODE=master
    89 #ESSID=n-o.unigor.wleiden.net
    90 #CHANNEL=1
     93Bullet_IP=192.168.1.20
     94BulletMAC=
     95MODE=master
     96ESSID=n-o.unigor.wleiden.net
     97CHANNEL=1
    9198VR3
    9299
    93 $config{'vr3:0'}=sprintf <<VR30;  # Link naar Brug via bullet 2
     100$config{'vr3:0'}=sprintf <<VR30;
     101COMMENT=Link naar Brug via bullet 2
    94102TYPE=ethernet
    95103IP=172.16.0.17/30
     
    99107VR30
    100108
    101 $config{'vr3:1'}=sprintf <<VR31;  # Link naar Camimplants via bullet 2
     109$config{'vr3:1'}=sprintf <<VR31;
     110COMMENT=Link naar Camimplants via bullet 2
    102111TYPE=ethernet
    103112IP=172.16.1.117/30
     
    107116VR31
    108117
    109 $config{'sis0'}=sprintf <<SIS0;  # a-link Nanostation5 naar DirkLos2
     118$config{'sis0'}=sprintf <<SIS0;
     119COMMENT=a-link Nanostation5 naar DirkLos2
    110120TYPE=ethernet
    111121EXTRA_TYPE=eth2wifibridge
     
    114124SDESC=2DirkLos2
    115125DHCP=no
    116 #IP nanostation 172.16.4.2
    117 #NSMAC=00:15:6D:D0:14:75
    118 #ESSID=il-0.unigor.wleiden.net
    119 #CHANNEL=52
    120 #mode 11a bridge master
     126NANO_IP=172.16.4.2
     127NSMAC=00:15:6D:D0:14:75
     128ESSID=il-0.unigor.wleiden.net
     129CHANNEL=52
     130MODE 11a bridge master
    121131SIS0
    122132
    123 $config{'sis1'}=sprintf <<SIS1;  # EthernetLink UniGorN
     133$config{'sis1'}=sprintf <<SIS1;
     134COMMENT=EthernetLink UniGorN
    124135TYPE=ethernet
    125136IP=172.16.1.169/30
     
    129140SIS1
    130141
    131 $config{'sis2'}=sprintf <<SIS2;  # Ethernet
     142$config{'sis2'}=sprintf <<SIS2;
     143COMMENT=Ethernet
    132144TYPE=ethernet
    133145IP=172.19.128.65/28
  • nodes/CNodeUniGorN/wleiden.conf

    r8153 r8261  
    1111$Y='464861';
    1212
    13 $config{'ath0'}=sprintf <<ATH0;  # oegstgeest richting N
     13$config{'ath0'}=sprintf <<ATH0;
     14COMMENT=oegstgeest richting N
    1415TYPE=wireless
    1516IP=$master_ip/26
     
    2223ATH0
    2324
    24 $config{'ue0'}=sprintf <<UE0; #link naar kaagdorp via Bullet 1
     25$config{'ue0'}=sprintf <<UE0;
     26COMMENT=link naar kaagdorp via Bullet 1
    2527TYPE=ethernet
    2628IP=172.16.1.45/30
     
    2830SDESC=2kaag2
    2931DHCP=no
    30 #MODE=master
    31 #ESSID=il-o.unigorn.wleiden.net
    32 #CHANNEL=9
     32MODE=master
     33ESSID=il-o.unigorn.wleiden.net
     34CHANNEL=9
    3335UE0
    3436
    35 $config{'ue0:0'}=sprintf <<UE00; #link naar kaag
     37$config{'ue0:0'}=sprintf <<UE00;
     38COMMENT=link naar kaag
    3639TYPE=ethernet
    3740IP=172.16.0.217/30
     
    4144UE00
    4245
    43 $config{'vr0'}=sprintf <<VR0;  # A link Hofwijck
     46$config{'vr0'}=sprintf <<VR0;
     47COMMENT=A link Hofwijck
    4448TYPE=ethernet
    4549IP=172.16.4.41/30
     
    4751SDESC=2hofwijck
    4852DHCP=no
    49 #MODE=ap bridge
    50 #ESSID=il-o.unigorn.wleiden.net
    51 #CHANNEL=104
    52 #NSMAC=00:15:6D:EA:F0:64
    53 #NSIP=192.168.1.20
     53MODE=ap bridge
     54ESSID=il-o.unigorn.wleiden.net
     55CHANNEL=104
     56NSMAC=00:15:6D:EA:F0:64
     57NSIP=192.168.1.20
    5458VR0
    5559
    56 $config{'vr1'}=sprintf <<VR1;  # link naar LIACS
     60$config{'vr1'}=sprintf <<VR1;
     61COMMENT=link naar LIACS
    5762TYPE=ethernet
    5863IP=172.16.4.45/30
     
    6065SDESC=2liacs
    6166DHCP=no
    62 #MODE=ap bridge
    63 #ESSID=il-n.unigorn.wleiden.net
    64 #CHANNEL=128
    65 #NSMAC=00:15:6D:F2:37:FA
    66 #NSIP=192.168.1.20
     67MODE=ap bridge
     68ESSID=il-n.unigorn.wleiden.net
     69CHANNEL=128
     70NSMAC=00:15:6D:F2:37:FA
     71NSIP=192.168.1.20
    6772VR1
    6873
    69 $config{'vr1:0'}=sprintf <<VR10; # link naar Rustenborch 
     74$config{'vr1:0'}=sprintf <<VR10;
     75COMMENT=link naar Rustenborch 
    7076TYPE=ethernet
    7177IP=172.16.1.89/30
     
    7581VR10
    7682
    77 $config{'vr2'}=sprintf <<VR2;  # EthernetLink naar UniGor
     83$config{'vr2'}=sprintf <<VR2;
     84COMMENT=EthernetLink naar UniGor
    7885TYPE=ethernet
    7986IP=172.16.1.170/30
  • nodes/CNodeVeldbies/wleiden.conf

    r8260 r8261  
    1717$Y='465148';
    1818
    19 $config{'sis0'}=sprintf <<ED0;  # eth
     19$config{'sis0'}=sprintf <<ED0;
     20COMMENT=eth
    2021TYPE=ethernet
    2122IP=172.25.0.65/29
     
    3132ED0
    3233
    33 $config{'wi0'}=sprintf <<EW0;  # OMNI
     34$config{'wi0'}=sprintf <<EW0;
     35COMMENT=OMNI
    3436TYPE=wireless
    3537IP=$master_ip/26
     
    4850EW0
    4951
    50 $config{'wi1'}=sprintf <<EW1;  # link naar NodeSOM
     52$config{'wi1'}=sprintf <<EW1;
     53COMMENT=link naar NodeSOM
    5154TYPE=wireless
    5255IP=172.16.0.122/30
  • nodes/CNodeVosko1/wleiden.conf

    r8195 r8261  
    1111$Y='463657';
    1212
    13 $config{'ath0'}=sprintf <<ATH0;  # ap west
     13$config{'ath0'}=sprintf <<ATH0;
     14COMMENT=ap west
    1415TYPE=wireless
    1516IP=$master_ip/26
     
    2223ATH0
    2324
    24 $config{'ath0:0'}=sprintf <<ATH00;  # link Thomas
     25$config{'ath0:0'}=sprintf <<ATH00;
     26COMMENT=link Thomas
    2527TYPE=wireless
    2628IP=172.16.0.205/30
     
    3032ATH00
    3133
    32 $config{'ath0:1'}=sprintf <<ATH01;  # link OBLSte
     34$config{'ath0:1'}=sprintf <<ATH01;
     35COMMENT=link OBLSte
    3336TYPE=wireless
    3437IP=172.16.3.5/30
     
    3841ATH01
    3942
    40 $config{'vr0'}=sprintf <<VR0; # lokaal ethernet
     43$config{'vr0'}=sprintf <<VR0;
     44COMMENT=lokaal ethernet
    4145TYPE=ethernet
    4246IP=172.17.175.71/28
     
    4650VR0
    4751
    48 $config{'vr1'}=sprintf <<VR1; # a-link
     52$config{'vr1'}=sprintf <<VR1;
     53COMMENT=a-link
    4954TYPE=ethernet
    5055EXTRA_TYPE=eth2wifibridge
     
    5358SDESC=2zw
    5459DHCP=no
    55 #MODE=master
    56 #ESSID=il-zw.vosko1.wleiden.net
    57 #CHANNEL=64
    58 #NSMAC=00:15:6D:ED:83:7D
     60MODE=master
     61ESSID=il-zw.vosko1.wleiden.net
     62CHANNEL=64
     63NSMAC=00:15:6D:ED:83:7D
    5964VR1
    6065
    61 $config{'vr2'}=sprintf <<VR2;  # Ethernet/PoE naar AP in kerk
     66$config{'vr2'}=sprintf <<VR2;
     67COMMENT=Ethernet/PoE naar AP in kerk
    6268TYPE=ethernet
    6369IP=172.17.174.65/28
    6470DESC=Ethernet naar Pieterskerk
    6571SDESC=2kerk
    66 #IP_NS2-LOCO=192.168.1.20
     72NS2_LOCO_IP=192.168.1.20
    6773DHCP=67-78
    6874VR2
  • nodes/CNodeVosko2/wleiden.conf

    r8235 r8261  
    1111$Y='463657';
    1212
    13 $config{'ath0'}=sprintf <<ATH0;  # ap noord
     13$config{'ath0'}=sprintf <<ATH0;
     14COMMENT=ap noord
    1415TYPE=wireless
    1516IP=$master_ip/26
     
    2223ATH0
    2324
    24 $config{'vr0'}=sprintf <<VR0;  # naar Rund
     25$config{'vr0'}=sprintf <<VR0;
     26COMMENT=naar Rund
    2527TYPE=ethernet
    2628EXTRA_TYPE=eth2wifibridge
     
    2931SDESC=2rund
    3032DHCP=no
    31 #MODE=master
    32 #ESSID=il-no.vosko2.wleiden.net
    33 #CHANNEL=44
    34 #NSMAC=00:15:6D:F3:35:7D
     33MODE=master
     34ESSID=il-no.vosko2.wleiden.net
     35CHANNEL=44
     36NSMAC=00:15:6D:F3:35:7D
    3537VR0
    3638
    3739
    38 $config{'vr1'}=sprintf <<VR1; # link Robijn
     40$config{'vr1'}=sprintf <<VR1;
     41COMMENT=link Robijn
    3942TYPE=ethernet
    4043EXTRA_TYPE=eth2wifibridge
     
    4245DESC=interlink w (Robijn)
    4346SDESC=2Robijn
    44 #MODE=master
    45 #ESSID=il-w.vosko2.wleiden.net
    46 #CHANNEL=140
    47 #NS_IP=172.16.4.114/29
    48 #NSMAC=00:15:6D:F7:BE:F7
     47MODE=master
     48ESSID=il-w.vosko2.wleiden.net
     49CHANNEL=140
     50NS_IP=172.16.4.114/29
     51NSMAC=00:15:6D:F7:BE:F7
    4952DHCP=no
    5053VR1
    5154
    52 $config{'vr1:0'}=sprintf <<VR10; # link naar Huub
     55$config{'vr1:0'}=sprintf <<VR10;
     56COMMENT=link naar Huub
    5357TYPE=ethernet
    5458EXTRA_TYPE=eth2wifibridge
     
    5963VR10
    6064
    61 $config{'vr1:1'}=sprintf <<VR11; # link naar BCSte
     65$config{'vr1:1'}=sprintf <<VR11;
     66COMMENT=link naar BCSte
    6267TYPE=ethernet
    6368EXTRA_TYPE=eth2wifibridge
     
    6873VR11
    6974
    70 $config{'vr2'}=sprintf <<VR2; # lokaal ethernet (naar Vosko1, 3)
     75$config{'vr2'}=sprintf <<VR2;
     76COMMENT=lokaal ethernet (naar Vosko1, 3)
    7177TYPE=ethernet
    7278IP=172.17.175.72/28
  • nodes/CNodeVosko3/wleiden.conf

    r8233 r8261  
    1111$Y='463657';
    1212
    13 $config{'ath0'}=sprintf <<ATH0;  # ap zuidoost
     13$config{'ath0'}=sprintf <<ATH0;
     14COMMENT=ap zuidoost
    1415TYPE=wireless
    1516IP=$master_ip/26
     
    2223ATH0
    2324
    24 $config{'vr0'}=sprintf <<VR0;  # a-link to Stadhuis via Nanostation5
     25$config{'vr0'}=sprintf <<VR0;
     26COMMENT=a-link to Stadhuis via Nanostation5
    2527TYPE=ethernet
    2628EXTRA_TYPE=eth2wifibridge
     
    2931SDESC=2stadhuis
    3032DHCP=no
    31 #MODE=master
    32 #ESSID=il-o.vosko3.wleiden.net
    33 #CHANNEL=108
    34 #NSMAC=
     33MODE=master
     34ESSID=il-o.vosko3.wleiden.net
     35CHANNEL=108
     36NSMAC=
    3537VR0
    3638
    37 $config{'vr0:0'}=sprintf <<VR00; # to nanostation mgmt interface
     39$config{'vr0:0'}=sprintf <<VR00;
     40COMMENT=to nanostation mgmt interface
    3841TYPE=ethernet
    3942IP=172.16.3.177/30
     
    4447
    4548
    46 $config{'vr1'}=sprintf <<VR1; # a-link to Plantsoen via Nanostation5
     49$config{'vr1'}=sprintf <<VR1;
     50COMMENT=a-link to Plantsoen via Nanostation5
    4751TYPE=ethernet
    4852EXTRA_TYPE=eth2wifibridge
     
    5155SDESC=2Plantsoen
    5256DHCP=no
    53 #MODE=master
    54 #ESSID=il-zo.vosko3.wleiden.net
    55 #CHANNEL=92
    56 #NSMAC=
     57MODE=master
     58ESSID=il-zo.vosko3.wleiden.net
     59CHANNEL=92
     60NSMAC=
    5761VR1
    5862
    59 $config{'vr1:0'}=sprintf <<VR10; # to nanostation mgmt interface
     63$config{'vr1:0'}=sprintf <<VR10;
     64COMMENT=to nanostation mgmt interface
    6065TYPE=ethernet
    6166IP=172.16.3.181/30
     
    6570VR10
    6671
    67 $config{'vr2'}=sprintf <<VR2; # a-link to DirkLos1 via Nanostation5
     72$config{'vr2'}=sprintf <<VR2;
     73COMMENT=a-link to DirkLos1 via Nanostation5
    6874TYPE=ethernet
    6975EXTRA_TYPE=eth2wifibridge
     
    7177DESC=ethernet to interlink wnw (DirkLos1)
    7278SDESC=2DirkLos1
    73 #MODE=master
    74 #ESSID=il-wnw.vosko3.wleiden.net
    75 #CHANNEL=100
    76 #NSMAC=00:15:6D:BD:68:9B
    77 #NSIP=172.16.4.74/29
     79MODE=master
     80ESSID=il-wnw.vosko3.wleiden.net
     81CHANNEL=100
     82NSMAC=00:15:6D:BD:68:9B
     83NSIP=172.16.4.74/29
    7884DHCP=no
    7985VR2
    8086
    81 $config{'vr2:0'}=sprintf <<VR20; # a-link to Geluidsnet2
     87$config{'vr2:0'}=sprintf <<VR20;
     88COMMENT=a-link to Geluidsnet2
    8289TYPE=ethernet
    8390EXTRA_TYPE=eth2wifibridge
     
    8895VR20
    8996
    90 $config{'ue0'}=sprintf <<UE0; # lokaal ethernet via usb-lan adapter
     97$config{'ue0'}=sprintf <<UE0;
     98COMMENT=lokaal ethernet via usb-lan adapter
    9199TYPE=ethernet
    92100IP=172.17.175.73/28
     
    94102SDESC=ethernet
    95103DHCP=no
    96 #USB-LAN-adapterMAC=00:00:e8:00:11:36
     104USB-LAN-adapterMAC=00:00:e8:00:11:36
    97105UE0
  • nodes/CNodeWBRotary1/wleiden.conf

    r8202 r8261  
    1919$AGGREGATE=22;
    2020
    21 $config{'sis0'}=sprintf <<ED0;  # eth
     21$config{'sis0'}=sprintf <<ED0;
     22COMMENT=eth
    2223TYPE=ethernet
    2324IP=172.25.52.65/29
     
    2627SDESC=eth
    2728
    28 #DHCP=68-70
     29DHCP=68-70
    2930DHCP=no
    3031
     
    3334ED0
    3435
    35 $config{'sis1'}=sprintf <<ED0;  # eth
     36$config{'sis1'}=sprintf <<ED0;
     37COMMENT=eth
    3638TYPE=ethernet
    3739IP=172.16.1.121/30
     
    4042SDESC=2WBRotary2
    4143
    42 #DHCP=68-70
     44DHCP=68-70
    4345DHCP=no
    4446
     
    4749ED0
    4850
    49 $config{'wi0'}=sprintf <<EW0;  # link naar HMKerk1
     51$config{'wi0'}=sprintf <<EW0;
     52COMMENT=link naar HMKerk1
    5053TYPE=wireless
    5154IP=172.16.2.29/30
     
    6265EW0
    6366
    64 $config{'wi1'}=sprintf <<EW1;  # OMNI
     67$config{'wi1'}=sprintf <<EW1;
     68COMMENT=OMNI
    6569TYPE=wireless
    6670IP=$master_ip/26
     
    8084
    8185
    82 $config{'wi2'}=sprintf <<EW2;  # link naar Gerard
     86$config{'wi2'}=sprintf <<EW2;
     87COMMENT=link naar Gerard
    8388
    8489TYPE=wireless
     
    99104EW2
    100105
    101 $config{'wi2:0'}=sprintf <<WI20;  # Link Zwet
     106$config{'wi2:0'}=sprintf <<WI20;
     107COMMENT=Link Zwet
    102108TYPE=ethernet
    103109IP=172.16.4.131/29
     
    108114WI20
    109115
    110 #$config{'wi2:0'}=sprintf <<EW20;  # link naar Zoetermeer Aalstlaan
    111 #TYPE=wireless
    112 #IP=172.16.2.29/30
    113 #DESC=Link naar zoetermeer aalstlaan
    114 #SDESC=2aalstlaan.wlztm
    115 #EW20
     116$config{'wi2:0'}=sprintf <<EW20;
     117COMMENT=link naar Zoetermeer Aalstlaan
     118TYPE=wireless
     119IP=172.16.16.5/30
     120DESC=Link naar zoetermeer aalstlaan
     121SDESC=2aalstlaan.wlztm
     122EW20
    116123
    117 #$config{'wi2:1'}=sprintf <<EW21;  # link naar Koudekerk Trekkertrek
    118 #TYPE=wireless
    119 #IP=172.16.2.37/30
    120 #DESC=Link naar Trekkertrek
    121 #SDESC=2Trekkertrek
    122 #EW21
     124$config{'wi2:1'}=sprintf <<EW21;
     125COMMENT=link naar Koudekerk Trekkertrek
     126TYPE=wireless
     127IP=172.16.2.37/30
     128DESC=Link naar Trekkertrek
     129SDESC=2Trekkertrek
     130EW21
    123131
    124132
  • nodes/CNodeWBRotary2/wleiden.conf

    r7657 r8261  
    1919$AGGREGATE=22;
    2020
    21 $config{'sis0'}=sprintf <<ED0;  # eth
     21$config{'sis0'}=sprintf <<ED0;
     22COMMENT=eth
    2223TYPE=ethernet
    2324IP=172.25.56.65/29
     
    2627SDESC=eth
    2728
    28 #DHCP=68-70
     29DHCP=68-70
    2930DHCP=no
    3031
     
    3334ED0
    3435
    35 $config{'sis1'}=sprintf <<ED1;  # ethernet naar CNodeWBRotary1
     36$config{'sis1'}=sprintf <<ED1;
     37COMMENT=ethernet naar CNodeWBRotary1
    3638TYPE=ethernet
    3739IP=172.16.1.122/30
     
    4042SDESC=2wbrotary1
    4143
    42 #DHCP=68-70
     44DHCP=68-70
    4345DHCP=no
    4446
     
    4749ED1
    4850
    49 $config{'wi0'}=sprintf <<EW0;  # OMNI
     51$config{'wi0'}=sprintf <<EW0;
     52COMMENT=OMNI
    5053TYPE=wireless
    5154IP=$master_ip/26
     
    6568
    6669
    67 $config{'wi1'}=sprintf <<EW1;  # link naar Rijnsaterwoude Gemeentehuis
     70$config{'wi1'}=sprintf <<EW1;
     71COMMENT=link naar Rijnsaterwoude Gemeentehuis
    6872TYPE=wireless
    6973IP=172.16.2.25/30
     
    8387
    8488
    85 $config{'wi2'}=sprintf <<EW2;  # link naar Alphen HWFortis
     89$config{'wi2'}=sprintf <<EW2;
     90COMMENT=link naar Alphen HWFortis
    8691TYPE=wireless
    8792IP=172.16.0.45/30
  • nodes/CNodeWP/wleiden.conf

    r7657 r8261  
    1717$status='up';
    1818
    19 $config{'sis0'}=sprintf <<SIS0;  # eth
     19$config{'sis0'}=sprintf <<SIS0;
     20COMMENT=eth
    2021TYPE=ethernet
    2122IP=172.19.168.65/29
     
    3132
    3233
    33 $config{'wi0'}=sprintf <<EW0;  # Locale Omni
     34$config{'wi0'}=sprintf <<EW0;
     35COMMENT=Locale Omni
    3436TYPE=wireless
    3537IP=$master_ip/26
     
    4951
    5052
    51 $config{'wi1'}=sprintf <<EW1;  # Link naar AZC
     53$config{'wi1'}=sprintf <<EW1;
     54COMMENT=Link naar AZC
    5255TYPE=wireless
    5356#11=Wandy WP depedance
  • nodes/CNodeWissel/wleiden.conf

    r8049 r8261  
    1313$status='up';
    1414
    15 $config{'ep0'}=sprintf <<EP0;  # eth
     15$config{'ep0'}=sprintf <<EP0;
     16COMMENT=eth
    1617TYPE=ethernet
    1718IP=172.19.182.65/29
     
    2122EP0
    2223
    23 $config{'wi0'}=sprintf <<EW0;  # Locale Omni
     24$config{'wi0'}=sprintf <<EW0;
     25COMMENT=Locale Omni
    2426TYPE=wireless
    2527IP=$master_ip/26
     
    3234EW0
    3335
    34 $config{'wi1'}=sprintf <<EW1;  # Link naar AZC
     36$config{'wi1'}=sprintf <<EW1;
     37COMMENT=Link naar AZC
    3538TYPE=wireless
    3639IP=172.16.2.54/30
  • nodes/CNodeZijloever/wleiden.conf

    r8039 r8261  
    1818$Y='464073';
    1919
    20 $config{'ep0'}=sprintf <<ED0;  # Ethernet
     20$config{'ep0'}=sprintf <<ED0;
     21COMMENT=Ethernet
    2122TYPE=ethernet
    2223IP=172.19.0.65/28
     
    3233
    3334
    34 $config{'wi0'}=sprintf <<EW0;  # omni
     35$config{'wi0'}=sprintf <<EW0;
     36COMMENT=omni
    3537TYPE=wireless
    3638IP=$master_ip/26
     
    4951EW0
    5052
    51 $config{'wi1'}=sprintf <<EW1;  # link naar SOM
     53$config{'wi1'}=sprintf <<EW1;
     54COMMENT=link naar SOM
    5255TYPE=wireless
    5356IP=172.16.1.62/30
     
    5861MODE=managed
    5962ESSID=il-z.som.wleiden.net
    60 #CHANNEL=5
     63CHANNEL=5
    6164
    6265
     
    6568EW1
    6669
    67 $config{'wi2'}=sprintf <<EW2;  # link naar Roomburgh1
     70$config{'wi2'}=sprintf <<EW2;
     71COMMENT=link naar Roomburgh1
    6872TYPE=wireless
    6973IP=172.16.0.230/30
     
    7478ESSID=il-n.roomburgh1.wleiden.net
    7579
    76 #CHANNEL=3
     80CHANNEL=3
    7781
    7882
  • nodes/CNodeZwaluwak/wleiden.conf

    r8151 r8261  
    1515$Y='463249';
    1616
    17 $config{'ath0'}=sprintf <<ATH0;   # Omni
     17$config{'ath0'}=sprintf <<ATH0;
     18COMMENT=Omni
    1819TYPE=wireless
    1920IP=$master_ip/26
     
    2627ATH0
    2728
    28 $config{'vr0'}=sprintf <<VR0;  # Ethernet
     29$config{'vr0'}=sprintf <<VR0;
     30COMMENT=Ethernet
    2931TYPE=ethernet
    3032IP=172.22.0.65/30
     
    3537VR0
    3638
    37 $config{'vr1'}=sprintf <<VR1;  # link naar Unused via Bullet 1
     39$config{'vr1'}=sprintf <<VR1;
     40COMMENT=link naar Unused via Bullet 1
    3841TYPE=ethernet
    3942EXTRA_TYPE=eth2wifibridge
     
    4245SDESC=2unused
    4346DHCP=no
    44 #Bullet_IP=192.168.1.20
    45 #BulletMAC=00:15:6D:E8:E7:4A
    46 #MODE=managed
    47 #ESSID=effeniks
     47Bullet_IP=192.168.1.20
     48BulletMAC=00:15:6D:E8:E7:4A
     49MODE=managed
     50ESSID=effeniks
    4851VR1
    4952
    50 $config{'vr2'}=sprintf <<VR2; # link naar BCStevenshof via Bullet 2
     53$config{'vr2'}=sprintf <<VR2;
     54COMMENT=link naar BCStevenshof via Bullet 2
    5155TYPE=ethernet
    5256EXTRA_TYPE=eth2wifibridge
     
    5559DESC=Link naar BCsSte
    5660SDESC=2bcste
    57 #Bullet_IP=172.16.3.252/29
    58 #BulletMAC=00:15:6D:E8:E6:A3
    59 #MODE=managed
    60 #ESSID=il-nw.bcste.wleiden.net
     61Bullet_IP=172.16.3.252/29
     62BulletMAC=00:15:6D:E8:E6:A3
     63MODE=managed
     64ESSID=il-nw.bcste.wleiden.net
    6165VR2
    6266
    63 $config{'aue0'}=sprintf <<UE0; # a-link naar NodeUnigor via Airlive
     67$config{'aue0'}=sprintf <<UE0;
     68COMMENT=a-link naar NodeUnigor via Airlive
    6469TYPE=ethernet
    6570EXTRA_TYPE=eth2wifibridge
     
    6974SDESC=2unigor
    7075DHCP=no
     76AIRLIVE_IP=192.168.1.21
     77MODE=managed
     78ESSID=ilA-z.unigor.wleiden.net
    7179UE0
    72 #AIRLIVE_IP=192.168.1.21
    73 #MODE=managed
    74 #ESSID=ilA-z.unigor.wleiden.net
    75 UE00
  • nodes/CNodeZwet/wleiden.conf

    r8218 r8261  
    3030
    3131
    32 $config{'vr0'}=sprintf <<VR0; # Link naar Zwet Network
     32$config{'vr0'}=sprintf <<VR0;
     33COMMENT=Link naar Zwet Network
    3334TYPE=ethernet
    3435IP=172.27.129.65/28
     
    4243
    4344
    44 $config{'vr1'}=sprintf <<VR1;  # Link SOM2
     45$config{'vr1'}=sprintf <<VR1;
     46COMMENT=Link SOM2
    4547TYPE=ethernet
    4648IP=172.16.4.142/29
     
    5153VR1
    5254
    53 $config{'vr2'}=sprintf <<VR2;  # Link WBRotary1
     55$config{'vr2'}=sprintf <<VR2;
     56COMMENT=Link WBRotary1
    5457TYPE=ethernet
    5558IP=172.16.4.129/29
  • nodes/proxy1/wleiden.conf

    r8018 r8261  
    1919$Y='463889';
    2020
    21 $config{'sis0'}=sprintf <<SIS0;  # Ethernet
     21$config{'sis0'}=sprintf <<SIS0;
     22COMMENT=Ethernet
    2223TYPE=ethernet
    2324IP=83.162.36.91/24                                                                             
     
    2728SIS0
    2829
    29 $config{'sis1'}=sprintf <<SIS1;  # link naar NodeCope
     30$config{'sis1'}=sprintf <<SIS1;
     31COMMENT=link naar NodeCope
    3032TYPE=ethernet
    3133IP=$master_ip/28                                                               
  • nodes/proxy10/wleiden.conf

    r8260 r8261  
    2121$Y='463249';
    2222
    23 $config{'sis0'}=sprintf <<SIS0;  # Ethernet
     23$config{'sis0'}=sprintf <<SIS0;
     24COMMENT=Ethernet
    2425TYPE=ethernet
    2526IP=$master_ip/30
  • nodes/proxy11/wleiden.conf

    r8193 r8261  
    2323$Y='466843';
    2424
    25 $config{'sis0'}=sprintf <<SIS0;  # Ethernet
     25$config{'sis0'}=sprintf <<SIS0;
     26COMMENT=Ethernet
    2627TYPE=ethernet
    2728IP=$master_ip/30
     
    3334SIS0
    3435
    35 $config{'sis1'}=sprintf <<SIS1;  # Ethernet naar adsl
     36$config{'sis1'}=sprintf <<SIS1;
     37COMMENT=Ethernet naar adsl
    3638TYPE=ethernet                                                                             
    3739IP=192.168.1.70
  • nodes/proxy12/wleiden.conf

    r8260 r8261  
    2121$nat='yes';
    2222
    23 $config{'sis0'}=sprintf <<SIS0;  # link naar Router
     23$config{'sis0'}=sprintf <<SIS0;
     24COMMENT=link naar Router
    2425TYPE=ethernet
    2526IP=0.0.0.0
     
    2930SIS0
    3031
    31 $config{'sis1'}=sprintf <<SIS1;  # link naar NodeHuub
     32$config{'sis1'}=sprintf <<SIS1;
     33COMMENT=link naar NodeHuub
    3234TYPE=ethernet
    3335IP=$master_ip/30
  • nodes/proxy13/wleiden.conf

    r8032 r8261  
    1717$Y='461987';
    1818
    19 $config{'sis0'}=sprintf <<SIS0;  # link naar Router
     19$config{'sis0'}=sprintf <<SIS0;
     20COMMENT=link naar Router
    2021TYPE=ethernet
    2122DHCPCLIENT=yes
     
    2627SIS0
    2728
    28 $config{'sis1'}=sprintf <<SIS1;  # link naar NodeRick
     29$config{'sis1'}=sprintf <<SIS1;
     30COMMENT=link naar NodeRick
    2931TYPE=ethernet
    3032IP=$master_ip/30
  • nodes/proxy2/wleiden.conf

    r8018 r8261  
    1818$Y='463704';
    1919
    20 $config{'sis0'}=sprintf <<SIS0;  # Link naar router
     20$config{'sis0'}=sprintf <<SIS0;
     21COMMENT=Link naar router
    2122TYPE=ethernet
    2223
     
    2930SIS0
    3031
    31 $config{'sis1'}=sprintf <<SIS1;  # Link naar NodeCeTIM
     32$config{'sis1'}=sprintf <<SIS1;
     33COMMENT=Link naar NodeCeTIM
    3234TYPE=ethernet
    3335IP=$master_ip/28
     
    3739SIS1
    3840
    39 $config{'sis2'}=sprintf <<SIS2;  # Lokaal Ethernet naar kerk
     41$config{'sis2'}=sprintf <<SIS2;
     42COMMENT=Lokaal Ethernet naar kerk
    4043TYPE=ethernet
    4144IP=172.17.143.17/26
  • nodes/proxy3/wleiden.conf

    r8018 r8261  
    1515$Y='462819';
    1616
    17 $config{'sis0'}=sprintf <<SIS0;  # Ethernet
     17$config{'sis0'}=sprintf <<SIS0;
     18COMMENT=Ethernet
    1819TYPE=ethernet
    1920IP=83.160.182.75/24                                                                       
     
    2324SIS0
    2425
    25 $config{'sis1'}=sprintf <<SIS1;  # Ethernet
     26$config{'sis1'}=sprintf <<SIS1;
     27COMMENT=Ethernet
    2628TYPE=ethernet
    2729IP=$master_ip/29
  • nodes/proxy4/wleiden.conf

    r8018 r8261  
    2121$Y='462256';
    2222
    23 $config{'sis0'}=sprintf <<SIS0;  # Link naar Router
     23$config{'sis0'}=sprintf <<SIS0;
     24COMMENT=Link naar Router
    2425TYPE=ethernet
    2526IP=192.168.1.100/24                                                         
     
    3132SIS0
    3233
    33 $config{'sis1'}=sprintf <<SIS1;  # Link naar NodeLivingLab
     34$config{'sis1'}=sprintf <<SIS1;
     35COMMENT=Link naar NodeLivingLab
    3436TYPE=ethernet
    3537IP=$master_ip/30
  • nodes/proxy5/wleiden.conf

    r8018 r8261  
    2020$Y='465365';
    2121
    22 $config{'sis0'}=sprintf <<SIS0;  # Link naar router
     22$config{'sis0'}=sprintf <<SIS0;
     23COMMENT=Link naar router
    2324TYPE=ethernet
    2425IP=192.168.0.16/24                                                                               
     
    2829SIS0
    2930
    30 $config{'sis1'}=sprintf <<SIS1;  # Link naar NodeWP
     31$config{'sis1'}=sprintf <<SIS1;
     32COMMENT=Link naar NodeWP
    3133TYPE=ethernet
    3234IP=$master_ip/30
  • nodes/proxy6/wleiden.conf

    r8018 r8261  
    2121
    2222
    23 $config{'sis0'}=sprintf <<SIS0;  # link naar Router
     23$config{'sis0'}=sprintf <<SIS0;
     24COMMENT=link naar Router
    2425TYPE=ethernet
    2526IP=192.168.1.200/24
     
    2930SIS0
    3031
    31 $config{'sis1'}=sprintf <<SIS1;  # link naar NodeMuiderkring
     32$config{'sis1'}=sprintf <<SIS1;
     33COMMENT=link naar NodeMuiderkring
    3234TYPE=ethernet
    3335IP=$master_ip/30
  • nodes/proxy62/wleiden.conf

    r8018 r8261  
    2020$Y='463569';
    2121
    22 $config{'vr0'}=sprintf <<VR0;  # link naar Router
     22$config{'vr0'}=sprintf <<VR0;
     23COMMENT=link naar Router
    2324TYPE=ethernet
    2425IP=192.168.3.101/24
     
    2829VR0
    2930
    30 $config{'vr1'}=sprintf <<VR1;  # link naar NodeHuub
     31$config{'vr1'}=sprintf <<VR1;
     32COMMENT=link naar NodeHuub
    3133TYPE=ethernet
    3234IP=$master_ip/30
  • nodes/proxy7/wleiden.conf

    r8018 r8261  
    2323$Y='463407';
    2424
    25 $config{'sis0'}=sprintf <<SIS0;  # Link naar Router
     25$config{'sis0'}=sprintf <<SIS0;
     26COMMENT=Link naar Router
    2627TYPE=ethernet
    2728IP=192.168.200.100/24
     
    3132SIS0
    3233
    33 $config{'sis1'}=sprintf <<SIS1;  # Local 24-subnet to node and clients
     34$config{'sis1'}=sprintf <<SIS1;
     35COMMENT=Local 24-subnet to node and clients
    3436TYPE=ethernet
    3537IP=$master_ip/24
  • nodes/proxy8/wleiden.conf

    r8211 r8261  
    2323
    2424
    25 $config{'sis0'}=sprintf <<SIS0;  # Link naar Router
     25$config{'sis0'}=sprintf <<SIS0;
     26COMMENT=Link naar Router
    2627TYPE=ethernet
    2728IP=192.168.58.2/24
     
    3435SIS0
    3536
    36 $config{'sis1'}=sprintf <<SIS1;  # Link naar Laptop
     37$config{'sis1'}=sprintf <<SIS1;
     38COMMENT=Link naar Laptop
    3739TYPE=ethernet
    3840IP=$master_ip/30
  • nodes/proxy9/wleiden.conf

    r8018 r8261  
    1919$Y='462845';
    2020
    21 $config{'sis0'}=sprintf <<SIS0;  # Link naar Router
     21$config{'sis0'}=sprintf <<SIS0;
     22COMMENT=Link naar Router
    2223TYPE=ethernet
    2324IP=192.168.1.100/24
     
    2728SIS0
    2829
    29 $config{'sis1'}=sprintf <<SIS1;  # Link naar Node
     30$config{'sis1'}=sprintf <<SIS1;
     31COMMENT=Link naar Node
    3032TYPE=ethernet
    3133IP=$master_ip/30
  • nodes/proxy97/wleiden.conf

    r8018 r8261  
    2020$Y='463238';
    2121
    22 $config{'sis0'}=sprintf <<SIS0;  # link naar router
     22$config{'sis0'}=sprintf <<SIS0;
     23COMMENT=link naar router
    2324TYPE=ethernet
    2425IP=10.0.1.100/24
     
    2829SIS0
    2930
    30 $config{'sis1'}=sprintf <<SIS1;  # link naar NodePlantsoen2
     31$config{'sis1'}=sprintf <<SIS1;
     32COMMENT=link naar NodePlantsoen2
    3133TYPE=ethernet
    3234IP=$master_ip/28
Note: See TracChangeset for help on using the changeset viewer.