Commit 1697a57b authored by Imre Jonk's avatar Imre Jonk

Replace 'kalium' with 'soerel'

parent cbb99093
...@@ -27,7 +27,7 @@ VLANS @ACTA ...@@ -27,7 +27,7 @@ VLANS @ACTA
down (5): down (5):
1: (nc) 1: (nc)
2: (kalium) 15, 199 2: (soerel) 15, 199
3: (stanleyH) 15, 199 3: (stanleyH) 15, 199
4: (techinc peering) 4: (techinc peering)
5: (empty) 5: (empty)
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
. paths.sh . paths.sh
HOSTS="bprouter kalium" HOSTS="bprouter soerel"
cz () cz ()
{ {
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
10.205.252.6 gestire 10.205.252.6 gestire
10.205.252.7 wurlitzer 10.205.252.7 wurlitzer
10.205.252.8 tristor 10.205.252.8 tristor
10.205.252.9 kalium 10.205.252.9 soerel
10.205.252.10 atc 10.205.252.10 atc
10.205.252.11 gwl 10.205.252.11 gwl
10.205.252.12 sn1 10.205.252.12 sn1
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
10.205.12.1 atc #air traffic control - router to 020, vm on isoup 10.205.12.1 atc #air traffic control - router to 020, vm on isoup
10.205.12.14 tomato dellws # connected to first disk shelf 10.205.12.14 tomato dellws # connected to first disk shelf
10.205.12.15 isoup 16GB #xen machine 10.205.12.15 isoup 16GB #xen machine
10.205.12.16 kalium sun #nothing yet 10.205.12.16 soerel sun #nothing yet
10.205.12.17 supai #connected to second disk shelf 10.205.12.17 supai #connected to second disk shelf
10.205.12.18 wurlitzer #jukebox 10.205.12.18 wurlitzer #jukebox
10.205.12.19 stofzuiger #big thing with lots of disks 10.205.12.19 stofzuiger #big thing with lots of disks
......
...@@ -9,9 +9,7 @@ ...@@ -9,9 +9,7 @@
10.205.253.6 ns0.adm 10.205.253.6 ns0.adm
10.205.253.7 nieuwlandrouter 10.205.253.7 nieuwlandrouter
10.205.253.8 tristor 10.205.253.8 tristor
10.205.253.9 kalium 10.205.253.9 soerel
10.205.253.13 hemelvaart
10.205.253.10 beckers #wfc
10.205.253.11 gwl 10.205.253.11 gwl
10.205.253.12 dwk 10.205.253.12 dwk
10.205.253.13 sn1 #hemelvaart??? 10.205.253.13 hemelvaart
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
10.205.255.9 acta-wg-stanleyh 10.205.255.9 acta-wg-stanleyh
10.205.255.10 acta-wg-radio-acta 10.205.255.10 acta-wg-radio-acta
10.205.255.11 acta-wg-radio-wg 10.205.255.11 acta-wg-radio-wg
10.205.255.12 acta-wg-kalium-acta-wg 10.205.255.12 acta-wg-soerel-acta-wg
10.205.255.13 acta-wg-duja 10.205.255.13 acta-wg-duja
10.205.255.14 acta-wg-nothing 10.205.255.14 acta-wg-nothing
10.205.255.15 acta-wg-broadcast 10.205.255.15 acta-wg-broadcast
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
10.205.255.16 acta-east-net29 10.205.255.16 acta-east-net29
10.205.255.17 acta-east-stanley 10.205.255.17 acta-east-stanley
10.205.255.18 acta-east-radio-acta 10.205.255.18 acta-east-radio-acta
10.205.255.19 acta-east-kalium 10.205.255.19 acta-east-soerel
10.205.255.20 nothing-acta-east 10.205.255.20 nothing-acta-east
10.205.255.21 nothing-acta-east 10.205.255.21 nothing-acta-east
10.205.255.22 nothing-acta-east 10.205.255.22 nothing-acta-east
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
10.205.255.25 stanleyh-acta-adm 10.205.255.25 stanleyh-acta-adm
10.205.255.26 radio-acta-acta-adm 10.205.255.26 radio-acta-acta-adm
10.205.255.27 radio-adm-acta 10.205.255.27 radio-adm-acta
10.205.255.28 kalium-acta-adm 10.205.255.28 soerel-acta-adm
10.205.255.29 nothing 10.205.255.29 nothing
10.205.255.30 router-adm 10.205.255.30 router-adm
10.205.255.31 broadcast-acta-adm 10.205.255.31 broadcast-acta-adm
...@@ -53,8 +53,8 @@ ...@@ -53,8 +53,8 @@
# Wireless Belgium vlan7 # Wireless Belgium vlan7
# 10.205.255.32/29 # 10.205.255.32/29
10.205.255.32 net29-acta-antwerp 10.205.255.32 net29-acta-antwerp
10.205.255.33 kalium-acta-antwerp 10.205.255.33 soerel-acta-antwerp
10.205.255.34 old-kalium-address-do-not-use 10.205.255.34 old-soerel-address-do-not-use
10.205.255.35 antwerp-omnitik #AS4661 10.205.255.35 antwerp-omnitik #AS4661
10.205.255.36 stanleyh 10.205.255.36 stanleyh
10.205.255.37 nothing 10.205.255.37 nothing
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
10.205.255.41 stanley-acta-hemelvaart 10.205.255.41 stanley-acta-hemelvaart
10.205.255.42 radio-acta-hem 10.205.255.42 radio-acta-hem
10.205.255.43 radio-hem-acta 10.205.255.43 radio-hem-acta
10.205.255.44 kalium-acta-hemelvaart 10.205.255.44 soerel-acta-hemelvaart
10.205.255.45 nothing 10.205.255.45 nothing
10.205.255.46 router-hem 10.205.255.46 router-hem
10.205.255.47 broadcast-acta-hemelvaart 10.205.255.47 broadcast-acta-hemelvaart
...@@ -75,9 +75,9 @@ ...@@ -75,9 +75,9 @@
# TechInc vlan10 # TechInc vlan10
# 10.205.255.48/29 dev eth1.10 proto kernel scope link src 10.205.255.49 # 10.205.255.48/29 dev eth1.10 proto kernel scope link src 10.205.255.49
10.205.255.48 net29-acta-techinc 10.205.255.48 net29-acta-techinc
10.205.255.49 kalium-acta-techinc 10.205.255.49 soerel-acta-techinc
10.205.255.50 techinc-router 10.205.255.50 techinc-router
10.205.255.51 old-kalium-do-not-use 10.205.255.51 old-soerel-do-not-use
10.205.255.52 stanley 10.205.255.52 stanley
10.205.255.53 nothing 10.205.255.53 nothing
10.205.255.54 nothing 10.205.255.54 nothing
......
...@@ -19,6 +19,6 @@ ...@@ -19,6 +19,6 @@
192.168.88.20 wfc-radio-to-acta 192.168.88.20 wfc-radio-to-acta
192.168.88.123 kalium 192.168.88.123 soerel
...@@ -23,6 +23,6 @@ ...@@ -23,6 +23,6 @@
195.169.146.77 195.169.146.77
195.169.146.78 195.169.146.78
195.169.146.79 195.169.146.79
195.169.146.80 kalium_pub 195.169.146.80 soerel_pub
195.169.146.82 wg_pub 195.169.146.82 wg_pub
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#set -e #set -e
. paths.sh . paths.sh
HOSTS="bprouter kalium" HOSTS="bprouter soerel"
cz () cz ()
{ {
......
...@@ -6,7 +6,7 @@ net.020wireless.nl. IN SOA ur80.waag.org. admin.020wireless.nl. ( ...@@ -6,7 +6,7 @@ net.020wireless.nl. IN SOA ur80.waag.org. admin.020wireless.nl. (
38400 38400
) )
; kalium ; soerel
net.020wireless.nl. IN NS ur80.waag.org. net.020wireless.nl. IN NS ur80.waag.org.
; not stanley anymore ; net.020wireless.nl. IN NS ur33.waag.org. ; not stanley anymore ; net.020wireless.nl. IN NS ur33.waag.org.
; down (and prob. new ip) ;net.020wireless.nl. IN NS d5c52b29.ftth.concepts.nl. ; down (and prob. new ip) ;net.020wireless.nl. IN NS d5c52b29.ftth.concepts.nl.
...@@ -16,7 +16,7 @@ net.020wireless.nl. IN NS dns0.020wireless.nl. ...@@ -16,7 +16,7 @@ net.020wireless.nl. IN NS dns0.020wireless.nl.
test IN A 1.2.3.4 test IN A 1.2.3.4
stanley IN A 195.169.146.33 stanley IN A 195.169.146.33
kalium IN A 195.169.146.80 soerel IN A 195.169.146.80
nwlnd IN A 185.2.240.205 nwlnd IN A 185.2.240.205
blackhole IN A 213.197.43.41 blackhole IN A 213.197.43.41
imephu IN CNAME blackhole imephu IN CNAME blackhole
......
...@@ -45,7 +45,7 @@ subgraph routers { ...@@ -45,7 +45,7 @@ subgraph routers {
node [color=brown image="router-icon.png"] node [color=brown image="router-icon.png"]
layer=physical layer=physical
stanleyh [label = "stanleyh \n acta techinc rack \n 10.205.253.1| <tinc> tinc | <eth0> eth0 | <vlan13> vlan13 | <vlan14> vlan14 | <vlan201> vlan201 | <vlan12> vlan12"] stanleyh [label = "stanleyh \n acta techinc rack \n 10.205.253.1| <tinc> tinc | <eth0> eth0 | <vlan13> vlan13 | <vlan14> vlan14 | <vlan201> vlan201 | <vlan12> vlan12"]
kalium [label = "kalium \n acta techinc rack \n 10.205.253.9| <tinc> tinc | <eth0> eth0 | <vlan13> vlan13 | <vlan14>"] soerel [label = "soerel \n acta techinc rack \n 10.205.253.9| <tinc> tinc | <eth0> eth0 | <vlan13> vlan13 | <vlan14>"]
ns0adm [label = "ns0.adm \n adm rack \n 10.205.253.6| <eth0> eth0 | <vlan201> vlan201"] ns0adm [label = "ns0.adm \n adm rack \n 10.205.253.6| <eth0> eth0 | <vlan201> vlan201"]
urrouter [label = "urrouter \n @waag? | <vlan201> vlan201"] urrouter [label = "urrouter \n @waag? | <vlan201> vlan201"]
itineris itineris
...@@ -100,7 +100,7 @@ subgraph logicalLink { ...@@ -100,7 +100,7 @@ subgraph logicalLink {
// tinc links // tinc links
edge [len=3,color="purple", style=dotted, label="", constraint=false]; edge [len=3,color="purple", style=dotted, label="", constraint=false];
stanleyh:tinc -- tinc_amsw stanleyh:tinc -- tinc_amsw
kalium:tinc -- tinc_amsw soerel:tinc -- tinc_amsw
lurch:tinc -- tinc_amsw lurch:tinc -- tinc_amsw
//vlans //vlans
...@@ -118,7 +118,7 @@ subgraph wirelessLink { ...@@ -118,7 +118,7 @@ subgraph wirelessLink {
subgraph gbit { subgraph gbit {
edge [color=red, constraint=false]; edge [color=red, constraint=false];
kalium:eth0 -- down:2 soerel:eth0 -- down:2
jkk jkk
stanleyh:eth0 -- down:3 stanleyh:eth0 -- down:3
testrouter:eth0 -- down:sfp testrouter:eth0 -- down:sfp
......
...@@ -68,10 +68,10 @@ ...@@ -68,10 +68,10 @@
<g id="edge11" class="edge"><title>stanleyh:eth0&#45;&#45;down:3</title> <g id="edge11" class="edge"><title>stanleyh:eth0&#45;&#45;down:3</title>
<path fill="none" stroke="red" stroke-width="2" d="M575.93,588.841C575.93,588.841 443.492,541.767 443.492,541.767"/> <path fill="none" stroke="red" stroke-width="2" d="M575.93,588.841C575.93,588.841 443.492,541.767 443.492,541.767"/>
</g> </g>
<!-- kalium --> <!-- soerel -->
<g id="node4" class="node"><title>kalium</title> <g id="node4" class="node"><title>soerel</title>
<path fill="none" stroke="brown" stroke-width="2" d="M482.015,824.841C482.015,824.841 574.015,824.841 574.015,824.841 580.015,824.841 586.015,818.841 586.015,812.841 586.015,812.841 586.015,691.841 586.015,691.841 586.015,685.841 580.015,679.841 574.015,679.841 574.015,679.841 482.015,679.841 482.015,679.841 476.015,679.841 470.015,685.841 470.015,691.841 470.015,691.841 470.015,812.841 470.015,812.841 470.015,818.841 476.015,824.841 482.015,824.841"/> <path fill="none" stroke="brown" stroke-width="2" d="M482.015,824.841C482.015,824.841 574.015,824.841 574.015,824.841 580.015,824.841 586.015,818.841 586.015,812.841 586.015,812.841 586.015,691.841 586.015,691.841 586.015,685.841 580.015,679.841 574.015,679.841 574.015,679.841 482.015,679.841 482.015,679.841 476.015,679.841 470.015,685.841 470.015,691.841 470.015,691.841 470.015,812.841 470.015,812.841 470.015,818.841 476.015,824.841 482.015,824.841"/>
<text text-anchor="middle" x="528.015" y="695.041" font-family="Times,serif" font-size="14.00">kalium </text> <text text-anchor="middle" x="528.015" y="695.041" font-family="Times,serif" font-size="14.00">soerel </text>
<text text-anchor="middle" x="528.015" y="710.041" font-family="Times,serif" font-size="14.00"> acta techinc rack </text> <text text-anchor="middle" x="528.015" y="710.041" font-family="Times,serif" font-size="14.00"> acta techinc rack </text>
<text text-anchor="middle" x="528.015" y="725.041" font-family="Times,serif" font-size="14.00"> 10.205.253.9</text> <text text-anchor="middle" x="528.015" y="725.041" font-family="Times,serif" font-size="14.00"> 10.205.253.9</text>
<polyline fill="none" stroke="brown" stroke-width="2" points="470.015,732.841 586.015,732.841 "/> <polyline fill="none" stroke="brown" stroke-width="2" points="470.015,732.841 586.015,732.841 "/>
...@@ -83,12 +83,12 @@ ...@@ -83,12 +83,12 @@
<polyline fill="none" stroke="brown" stroke-width="2" points="470.015,801.841 586.015,801.841 "/> <polyline fill="none" stroke="brown" stroke-width="2" points="470.015,801.841 586.015,801.841 "/>
<text text-anchor="middle" x="528.015" y="817.041" font-family="Times,serif" font-size="14.00"> </text> <text text-anchor="middle" x="528.015" y="817.041" font-family="Times,serif" font-size="14.00"> </text>
</g> </g>
<!-- kalium&#45;&#45;tinc_amsw --> <!-- soerel&#45;&#45;tinc_amsw -->
<g id="edge2" class="edge"><title>kalium:tinc&#45;&#45;tinc_amsw</title> <g id="edge2" class="edge"><title>soerel:tinc&#45;&#45;tinc_amsw</title>
<path fill="none" stroke="purple" stroke-dasharray="1,5" d="M586.015,744.341C586.015,744.341 673.409,767.579 725.641,781.467"/> <path fill="none" stroke="purple" stroke-dasharray="1,5" d="M586.015,744.341C586.015,744.341 673.409,767.579 725.641,781.467"/>
</g> </g>
<!-- kalium&#45;&#45;down --> <!-- soerel&#45;&#45;down -->
<g id="edge10" class="edge"><title>kalium:eth0&#45;&#45;down:2</title> <g id="edge10" class="edge"><title>soerel:eth0&#45;&#45;down:2</title>
<path fill="none" stroke="red" stroke-width="2" d="M470.015,767.341C470.015,767.341 443.492,517.767 443.492,517.767"/> <path fill="none" stroke="red" stroke-width="2" d="M470.015,767.341C470.015,767.341 443.492,517.767 443.492,517.767"/>
</g> </g>
<!-- ns0adm --> <!-- ns0adm -->
...@@ -592,10 +592,10 @@ ...@@ -592,10 +592,10 @@
<g id="virtual_edge11" class="edge"><title>stanleyh:eth0&#45;&#45;down:3</title> <g id="virtual_edge11" class="edge"><title>stanleyh:eth0&#45;&#45;down:3</title>
<path fill="none" stroke="red" stroke-width="2" d="M575.93,588.841C575.93,588.841 443.492,541.767 443.492,541.767"/> <path fill="none" stroke="red" stroke-width="2" d="M575.93,588.841C575.93,588.841 443.492,541.767 443.492,541.767"/>
</g> </g>
<!-- kalium --> <!-- soerel -->
<g id="virtual_node4_virtual" class="node"><title>kalium</title> <g id="virtual_node4_virtual" class="node"><title>soerel</title>
<path fill="none" stroke="brown" stroke-width="2" d="M482.015,824.841C482.015,824.841 574.015,824.841 574.015,824.841 580.015,824.841 586.015,818.841 586.015,812.841 586.015,812.841 586.015,691.841 586.015,691.841 586.015,685.841 580.015,679.841 574.015,679.841 574.015,679.841 482.015,679.841 482.015,679.841 476.015,679.841 470.015,685.841 470.015,691.841 470.015,691.841 470.015,812.841 470.015,812.841 470.015,818.841 476.015,824.841 482.015,824.841"/> <path fill="none" stroke="brown" stroke-width="2" d="M482.015,824.841C482.015,824.841 574.015,824.841 574.015,824.841 580.015,824.841 586.015,818.841 586.015,812.841 586.015,812.841 586.015,691.841 586.015,691.841 586.015,685.841 580.015,679.841 574.015,679.841 574.015,679.841 482.015,679.841 482.015,679.841 476.015,679.841 470.015,685.841 470.015,691.841 470.015,691.841 470.015,812.841 470.015,812.841 470.015,818.841 476.015,824.841 482.015,824.841"/>
<text text-anchor="middle" x="528.015" y="695.041" font-family="Times,serif" font-size="14.00">kalium </text> <text text-anchor="middle" x="528.015" y="695.041" font-family="Times,serif" font-size="14.00">soerel </text>
<text text-anchor="middle" x="528.015" y="710.041" font-family="Times,serif" font-size="14.00"> acta techinc rack </text> <text text-anchor="middle" x="528.015" y="710.041" font-family="Times,serif" font-size="14.00"> acta techinc rack </text>
<text text-anchor="middle" x="528.015" y="725.041" font-family="Times,serif" font-size="14.00"> 10.205.253.9</text> <text text-anchor="middle" x="528.015" y="725.041" font-family="Times,serif" font-size="14.00"> 10.205.253.9</text>
<polyline fill="none" stroke="brown" stroke-width="2" points="470.015,732.841 586.015,732.841 "/> <polyline fill="none" stroke="brown" stroke-width="2" points="470.015,732.841 586.015,732.841 "/>
...@@ -607,12 +607,12 @@ ...@@ -607,12 +607,12 @@
<polyline fill="none" stroke="brown" stroke-width="2" points="470.015,801.841 586.015,801.841 "/> <polyline fill="none" stroke="brown" stroke-width="2" points="470.015,801.841 586.015,801.841 "/>
<text text-anchor="middle" x="528.015" y="817.041" font-family="Times,serif" font-size="14.00"> </text> <text text-anchor="middle" x="528.015" y="817.041" font-family="Times,serif" font-size="14.00"> </text>
</g> </g>
<!-- kalium&#45;&#45;tinc_amsw --> <!-- soerel&#45;&#45;tinc_amsw -->
<g id="virtual_edge2" class="edge"><title>kalium:tinc&#45;&#45;tinc_amsw</title> <g id="virtual_edge2" class="edge"><title>soerel:tinc&#45;&#45;tinc_amsw</title>
<path fill="none" stroke="purple" stroke-dasharray="1,5" d="M586.015,744.341C586.015,744.341 673.409,767.579 725.641,781.467"/> <path fill="none" stroke="purple" stroke-dasharray="1,5" d="M586.015,744.341C586.015,744.341 673.409,767.579 725.641,781.467"/>
</g> </g>
<!-- kalium&#45;&#45;down --> <!-- soerel&#45;&#45;down -->
<g id="virtual_edge10" class="edge"><title>kalium:eth0&#45;&#45;down:2</title> <g id="virtual_edge10" class="edge"><title>soerel:eth0&#45;&#45;down:2</title>
<path fill="none" stroke="red" stroke-width="2" d="M470.015,767.341C470.015,767.341 443.492,517.767 443.492,517.767"/> <path fill="none" stroke="red" stroke-width="2" d="M470.015,767.341C470.015,767.341 443.492,517.767 443.492,517.767"/>
</g> </g>
<!-- ns0adm --> <!-- ns0adm -->
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment