Changeset 8261 in genesis for nodes/CNodeStadhuis


Ignore:
Timestamp:
Aug 8, 2010, 12:14:27 PM (15 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.
File:
1 edited

Legend:

Unmodified
Added
Removed

  • 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
Note: See TracChangeset for help on using the changeset viewer.