Changeset 10875 in genesis

Timestamp:

May 16, 2012, 5:00:04 PM (13 years ago)

Author:

rick

Message:

Volgende doosje (voor Richard zijn VPN development).

Location:

nodes

Files:

• HybridRick/wleiden.yaml (modified) (1 diff)
• HybridRick2/wleiden.yaml (modified) (1 diff)
• HybridRickVPN (copied) (copied from nodes/HybridRick2 )
• HybridRickVPN/wleiden.yaml (modified) (6 diffs)

nodes/HybridRick/wleiden.yaml

@@ -49 +49 @@
 
 iface_vr0:
-  comment    : "Link naar Rick2"
+  comment    : "Link naar RickRing"
   interface  : "vr0"
-  ip         : "172.16.3.66/30"
-  desc       : "Link naar Rick2"
-  sdesc      : "2rick2"
+  ip         : "172.16.6.113/28"
+  desc       : "Link naar RickRing"
+  sdesc      : "2ring"
   type       : "eth"
   dhcp       : False

nodes/HybridRick2/wleiden.yaml

@@ -57 +57 @@
 
 iface_vr1:
-  comment    : "Link naar Rick"
+  comment    : "Link naar RickRing"
   interface  : "vr1"
-  ip         : "172.16.3.65/30"
-  desc       : "Link naar Rick"
-  sdesc      : "2rick"
+  ip         : "172.16.6.114/28"
+  desc       : "Link naar RickRing"
+  sdesc      : "2ring"
   type       : "eth"
   dhcp       : False

nodes/HybridRickVPN/wleiden.yaml

@@ -6 +6 @@
 ileiden   : False
 latitude  : "4.47100"
-location  : "Rick  van der Zwet, Brahmslaan 40, 2324 AN, Leiden"
+location  : "Rick van der Zwet, Brahmslaan 40, 2324 AN, Leiden"
 longitude : "52.13999"
-masterip  : "172.17.34.1"
-nodename  : "Rick2"
+masterip  : "172.17.38.1"
+nodename  : "RickVPN"
 nodetype  : "Hybrid"
 rdnap_x   : 92280
@@ -15 +15 @@
 rdr_host  : "riff.vanderzwet.net"
 rdr_rules :
-- ['tcp', 9080, '172.17.0.41', 80]
-- ['tcp', 9081, '172.17.0.42', 554]
-- ['tcp', 9082, '172.17.0.43', 554]
-- ['tcp', 9083, '172.17.0.44', 80]
-- ['tcp', 9089, '172.17.37.10', 554]
+- ['tcp', 10080, '172.17.0.41', 80]
+- ['tcp', 10081, '172.17.0.42', 554]
+- ['tcp', 10082, '172.17.0.43', 554]
+- ['tcp', 10083, '172.17.0.44', 80]
+- ['tcp', 10089, '172.17.37.10', 554]
 release   : "9.0-RELEASE"
-remote_access: "riff.vanderzwet.net:2022"
+remote_access: "riff.vanderzwet.net:3022"
 service_accesspoint: True
 service_proxy_ileiden: True
 service_proxy_normal: True
+service_vpn_server: True
 status    : "up"
 
@@ -31 +32 @@
   comment    : "Internal Wireless"
   interface  : "ath0"
-  ip         : "172.17.34.1/26"
+  ip         : "172.17.38.1/26"
   desc       : "Internal Wireless"
   sdesc      : "binnen"
@@ -37 +38 @@
   type       : "11b"
   channel    : "1"
-  ssid       : "ap-WirelessLeiden-Rick2"
+  ssid       : "ap-WirelessLeiden-RickVPN"
   dhcp       : "10-60"
   compass    : "None"
@@ -57 +58 @@
 
 iface_vr1:
-  comment    : "Link naar Rick"
+  comment    : "Link naar RickRing"
   interface  : "vr1"
-  ip         : "172.16.3.65/30"
-  desc       : "Link naar Rick"
-  sdesc      : "2rick"
+  ip         : "172.16.6.115/30"
+  desc       : "Link naar RickRing"
+  sdesc      : "2ring"
   type       : "eth"
   dhcp       : False
@@ -71 +72 @@
   comment    : "Lokaal Dev Netwerk"
   interface  : "vr2"
-  ip         : "172.17.36.1/24"
+  ip         : "172.17.39.1/24"
   desc       : "LokaalDev"
   sdesc      : "2dev"