Changeset 11264 in genesis

Timestamp:

Jun 10, 2012, 3:49:19 PM (12 years ago)

Author:

huub

Message:

hybrids voor declercq lumc lebkov

Location:

nodes

Files:

• HybridDeClercq (moved) (moved from nodes/CNodeDeClercq )
• HybridDeClercq/wleiden.yaml (modified) (4 diffs)
• HybridLHS/wleiden.yaml (modified) (1 diff)
• HybridLUMC (moved) (moved from nodes/CNodeLUMC )
• HybridLUMC/wleiden.yaml (modified) (6 diffs)
• HybridLebkov (moved) (moved from nodes/CNodeLebkov )
• HybridLebkov/wleiden.yaml (modified) (3 diffs)
• retired/ProxyDeClercq (moved) (moved from nodes/ProxyDeClercq )

nodes/HybridDeClercq/wleiden.yaml

@@ -4 +4 @@
 board     : "ALIX2"
 comment   : "None"
-ileiden   : True
 latitude  : "52.15060"
 location  : "kantoor De Clercq, Hoge Rijndijk 306, 2314 AM, Leiden"
 longitude : "4.52066"
 masterip  : "172.18.128.1"
+gateway   : "213.125.162.249"
 nodename  : "DeClercq"
-nodetype  : "CNode"
+nodetype  : "Hybrid"
 rdnap_x   : 95694
 rdnap_y   : 462845
-release   : "8.2-RELEASE"
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_incoming_rdr: False
+service_proxy_ileiden: True
+service_proxy_normal: True
 status    : "up"
+
 
 
 iface_ath0:
   comment    : "AP voor de buurt"
-  ip         : "172.18.128.1/26"
+  ip         : "172.18.128.1/24"
   sdesc      : "ap"
   mode       : "ap"
@@ -25 +30 @@
   channel    : "4"
   ssid       : "ap-WirelessLeiden-Declercq"
-  dhcp       : "10-60"
+  dhcp       : "10-250"
   status     : "up"
 
@@ -47 +52 @@
 
 iface_vr0:
-  comment    : "Ethernet"
-  ip         : "172.16.4.53/30"
-  sdesc      : "2proxy9"
+  comment    : "Link naar Router Ziggo 40/8"
+  ip         : "213.125.162.254/29"
+  sdesc      : "uplink"
   type       : "eth"
   dhcp       : False
   status     : "up"
 
-
 iface_vr1:
-  comment    : "Ethernet to interlink west (Roomburgh3)"
+  comment    : "link west (Roomburgh3)"
   ip         : "172.16.5.185/29"
   sdesc      : "2roomburgh3"
@@ -73 +77 @@
 
 iface_vr2:
-  comment    : "A-link to Leythenrode  via Nanostation5"
+  comment    : "link to Leythenrode"
   ip         : "172.16.5.172/29"
   sdesc      : "2leythenrode"

nodes/HybridLHS/wleiden.yaml

@@ -4 +4 @@
 board     : "ALIX2"
 comment   : "None"
-ileiden   : True
 latitude  : "52.17305"
 location  : "De Leidse Houtschool, Adriaan Pauwstraat 1, 2334 CG, Leiden"

nodes/HybridLUMC/wleiden.yaml

@@ -10 +10 @@
 masterip  : "172.19.130.1"
 nodename  : "LUMC"
-nodetype  : "CNode"
+nodetype  : "Hybrid"
 rdnap_x   : "092851"
 rdnap_y   : 464586
-release   : "8.2-RELEASE"
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
 status    : "up"
-
 
 iface_ath0:
   comment    : "Ap"
-  ip         : "172.19.130.1/26"
+  ip         : "172.19.130.1/24"
   sdesc      : "ap"
   mode       : "ap"
@@ -25 +28 @@
   channel    : "8"
   ssid       : "ap-WirelessLeiden-Lumc"
-  dhcp       : "10-60"
+  dhcp       : "10-250"
   status     : "up"
 
 
 iface_ue0:
-  comment    : "Ethernet to interlink zuidwest"
+  comment    : "interlink zuidwest"
   ip         : "172.16.4.105/29"
-  sdesc      : "2cam"
-  mode       : "station-wds"
+  sdesc      : "2zuidwest"
+  mode       : "ap-wds"
   type       : "eth"
   extra_type : "eth2wifibridge"
@@ -47 +50 @@
 
 iface_vr0:
-  comment    : "Ethernet to interlink west"
+  comment    : "interlink west"
   ip         : "172.16.4.84/29"
   sdesc      : "2unigor1"
@@ -54 +57 @@
   extra_type : "eth2wifibridge"
   channel    : "128"
-  ssid       : "il-z0.unigor.wleiden.net"
+  ssid       : "il-zo.unigor.wleiden.net"
   dhcp       : False
   compass    : "w"
@@ -64 +67 @@
 
 iface_vr1:
-  comment    : "A-link zuidoost naar CeTIM2"
+  comment    : "link zuidoost naar CeTIM2"
   ip         : "172.16.4.97/29"
   sdesc      : "2cetim2"
-  mode       : "station-wds"
+  mode       : "ap-wds"
   type       : "eth"
   extra_type : "eth2wifibridge"
@@ -81 +84 @@
 
 iface_vr1_alias0:
-  comment    : "A-link zuidoost naar Lebkov"
+  comment    : "link zuidoost naar Lebkov"
   ip         : "172.16.4.161/29"
   sdesc      : "2lebkov"

nodes/HybridLebkov/wleiden.yaml

@@ -4 +4 @@
 board     : "ALIX2"
 comment   : "None"
-ileiden   : True
 latitude  : "52.16678"
 location  : "Lebkov & Sons, Bargelaan 8, 2333 CT, Leiden CS"
@@ -10 +9 @@
 masterip  : "172.19.152.1"
 nodename  : "Lebkov"
-nodetype  : "CNode"
+nodetype  : "Hybrid"
 rdnap_x   : 93058
 rdnap_y   : 464678
-release   : "8.2-RELEASE"
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
 status    : "up"
-
 
 iface_ath0:
@@ -56 +58 @@
 
 iface_vr2:
-  comment    : "A-link naar LUMC"
+  comment    : "link naar LUMC"
   ip         : "172.16.4.164/29"
   sdesc      : "2geluidsnet1"