From 1697a57ba6f1e63c05a39dabc13572a1cb1b4f8c Mon Sep 17 00:00:00 2001 From: Imre Jonk Date: Thu, 19 Apr 2018 23:04:26 +0200 Subject: [PATCH] Replace 'kalium' with 'soerel' --- VLANS | 2 +- dns/copy.sh | 2 +- dns/hostfiles/amsw_tunnel | 2 +- dns/hostfiles/irl | 2 +- dns/hostfiles/routers | 6 ++---- dns/hostfiles/transfernet | 16 +++++++-------- dns/hostfiles/vlan1acta | 2 +- dns/hostfiles/vlan706 | 2 +- dns/make.sh | 2 +- dns/staticzones/net.020wireless.nl.db | 4 ++-- netmap/layer1.dot | 6 +++--- netmap/layer1.svg | 28 +++++++++++++-------------- 12 files changed, 36 insertions(+), 38 deletions(-) diff --git a/VLANS b/VLANS index ad80390..e5597e6 100644 --- a/VLANS +++ b/VLANS @@ -27,7 +27,7 @@ VLANS @ACTA down (5): 1: (nc) -2: (kalium) 15, 199 +2: (soerel) 15, 199 3: (stanleyH) 15, 199 4: (techinc peering) 5: (empty) diff --git a/dns/copy.sh b/dns/copy.sh index 6672726..fddc398 100755 --- a/dns/copy.sh +++ b/dns/copy.sh @@ -2,7 +2,7 @@ . paths.sh -HOSTS="bprouter kalium" +HOSTS="bprouter soerel" cz () { diff --git a/dns/hostfiles/amsw_tunnel b/dns/hostfiles/amsw_tunnel index 7136c5e..ef25462 100644 --- a/dns/hostfiles/amsw_tunnel +++ b/dns/hostfiles/amsw_tunnel @@ -12,7 +12,7 @@ 10.205.252.6 gestire 10.205.252.7 wurlitzer 10.205.252.8 tristor -10.205.252.9 kalium +10.205.252.9 soerel 10.205.252.10 atc 10.205.252.11 gwl 10.205.252.12 sn1 diff --git a/dns/hostfiles/irl b/dns/hostfiles/irl index b8a1550..5a82827 100644 --- a/dns/hostfiles/irl +++ b/dns/hostfiles/irl @@ -20,7 +20,7 @@ 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.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.18 wurlitzer #jukebox 10.205.12.19 stofzuiger #big thing with lots of disks diff --git a/dns/hostfiles/routers b/dns/hostfiles/routers index 0347c06..6954d59 100644 --- a/dns/hostfiles/routers +++ b/dns/hostfiles/routers @@ -9,9 +9,7 @@ 10.205.253.6 ns0.adm 10.205.253.7 nieuwlandrouter 10.205.253.8 tristor -10.205.253.9 kalium -10.205.253.13 hemelvaart -10.205.253.10 beckers #wfc +10.205.253.9 soerel 10.205.253.11 gwl 10.205.253.12 dwk -10.205.253.13 sn1 #hemelvaart??? +10.205.253.13 hemelvaart diff --git a/dns/hostfiles/transfernet b/dns/hostfiles/transfernet index 38bdbff..6bccea7 100644 --- a/dns/hostfiles/transfernet +++ b/dns/hostfiles/transfernet @@ -23,7 +23,7 @@ 10.205.255.9 acta-wg-stanleyh 10.205.255.10 acta-wg-radio-acta 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.14 acta-wg-nothing 10.205.255.15 acta-wg-broadcast @@ -33,7 +33,7 @@ 10.205.255.16 acta-east-net29 10.205.255.17 acta-east-stanley 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.21 nothing-acta-east 10.205.255.22 nothing-acta-east @@ -45,7 +45,7 @@ 10.205.255.25 stanleyh-acta-adm 10.205.255.26 radio-acta-acta-adm 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.30 router-adm 10.205.255.31 broadcast-acta-adm @@ -53,8 +53,8 @@ # Wireless Belgium vlan7 # 10.205.255.32/29 10.205.255.32 net29-acta-antwerp -10.205.255.33 kalium-acta-antwerp -10.205.255.34 old-kalium-address-do-not-use +10.205.255.33 soerel-acta-antwerp +10.205.255.34 old-soerel-address-do-not-use 10.205.255.35 antwerp-omnitik #AS4661 10.205.255.36 stanleyh 10.205.255.37 nothing @@ -67,7 +67,7 @@ 10.205.255.41 stanley-acta-hemelvaart 10.205.255.42 radio-acta-hem 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.46 router-hem 10.205.255.47 broadcast-acta-hemelvaart @@ -75,9 +75,9 @@ # TechInc vlan10 # 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.49 kalium-acta-techinc +10.205.255.49 soerel-acta-techinc 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.53 nothing 10.205.255.54 nothing diff --git a/dns/hostfiles/vlan1acta b/dns/hostfiles/vlan1acta index 62b4689..52a31f3 100644 --- a/dns/hostfiles/vlan1acta +++ b/dns/hostfiles/vlan1acta @@ -19,6 +19,6 @@ 192.168.88.20 wfc-radio-to-acta -192.168.88.123 kalium +192.168.88.123 soerel diff --git a/dns/hostfiles/vlan706 b/dns/hostfiles/vlan706 index bf0b8cf..688caf9 100644 --- a/dns/hostfiles/vlan706 +++ b/dns/hostfiles/vlan706 @@ -23,6 +23,6 @@ 195.169.146.77 195.169.146.78 195.169.146.79 -195.169.146.80 kalium_pub +195.169.146.80 soerel_pub 195.169.146.82 wg_pub diff --git a/dns/make.sh b/dns/make.sh index db3bf28..9b9d786 100755 --- a/dns/make.sh +++ b/dns/make.sh @@ -2,7 +2,7 @@ #set -e . paths.sh -HOSTS="bprouter kalium" +HOSTS="bprouter soerel" cz () { diff --git a/dns/staticzones/net.020wireless.nl.db b/dns/staticzones/net.020wireless.nl.db index 0ed9e3a..860ff7e 100644 --- a/dns/staticzones/net.020wireless.nl.db +++ b/dns/staticzones/net.020wireless.nl.db @@ -6,7 +6,7 @@ net.020wireless.nl. IN SOA ur80.waag.org. admin.020wireless.nl. ( 38400 ) -; kalium +; soerel net.020wireless.nl. IN NS ur80.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. @@ -16,7 +16,7 @@ net.020wireless.nl. IN NS dns0.020wireless.nl. test IN A 1.2.3.4 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 blackhole IN A 213.197.43.41 imephu IN CNAME blackhole diff --git a/netmap/layer1.dot b/netmap/layer1.dot index 4d0b8f2..e9dab6e 100644 --- a/netmap/layer1.dot +++ b/netmap/layer1.dot @@ -45,7 +45,7 @@ subgraph routers { node [color=brown image="router-icon.png"] layer=physical stanleyh [label = "stanleyh \n acta techinc rack \n 10.205.253.1| tinc | eth0 | vlan13 | vlan14 | vlan201 | vlan12"] -kalium [label = "kalium \n acta techinc rack \n 10.205.253.9| tinc | eth0 | vlan13 | "] +soerel [label = "soerel \n acta techinc rack \n 10.205.253.9| tinc | eth0 | vlan13 | "] ns0adm [label = "ns0.adm \n adm rack \n 10.205.253.6| eth0 | vlan201"] urrouter [label = "urrouter \n @waag? | vlan201"] itineris @@ -100,7 +100,7 @@ subgraph logicalLink { // tinc links edge [len=3,color="purple", style=dotted, label="", constraint=false]; stanleyh:tinc -- tinc_amsw -kalium:tinc -- tinc_amsw +soerel:tinc -- tinc_amsw lurch:tinc -- tinc_amsw //vlans @@ -118,7 +118,7 @@ subgraph wirelessLink { subgraph gbit { edge [color=red, constraint=false]; -kalium:eth0 -- down:2 +soerel:eth0 -- down:2 jkk stanleyh:eth0 -- down:3 testrouter:eth0 -- down:sfp diff --git a/netmap/layer1.svg b/netmap/layer1.svg index 3b8ec08..c66d39a 100644 --- a/netmap/layer1.svg +++ b/netmap/layer1.svg @@ -68,10 +68,10 @@ stanleyh:eth0--down:3 - -kalium + +soerel -kalium +soerel acta techinc rack 10.205.253.9 @@ -83,12 +83,12 @@ - -kalium:tinc--tinc_amsw + +soerel:tinc--tinc_amsw - -kalium:eth0--down:2 + +soerel:eth0--down:2 @@ -592,10 +592,10 @@ stanleyh:eth0--down:3 - -kalium + +soerel -kalium +soerel acta techinc rack 10.205.253.9 @@ -607,12 +607,12 @@ - -kalium:tinc--tinc_amsw + +soerel:tinc--tinc_amsw - -kalium:eth0--down:2 + +soerel:eth0--down:2 -- GitLab