Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
0
020_dns
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
020-wireless
020_dns
Commits
8faae4cf
Commit
8faae4cf
authored
Apr 21, 2018
by
hark
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of 185.52.224.4:020-wireless/020_dns
parents
56861628
1697a57b
Changes
14
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
67 additions
and
80 deletions
+67
-80
VLANS
VLANS
+1
-1
dns/copy.sh
dns/copy.sh
+4
-10
dns/hostfiles/amsw_tunnel
dns/hostfiles/amsw_tunnel
+3
-1
dns/hostfiles/forwardzones.conf
dns/hostfiles/forwardzones.conf
+12
-0
dns/hostfiles/irl
dns/hostfiles/irl
+1
-1
dns/hostfiles/routers
dns/hostfiles/routers
+3
-4
dns/hostfiles/transfernet
dns/hostfiles/transfernet
+21
-41
dns/hostfiles/vlan1acta
dns/hostfiles/vlan1acta
+1
-1
dns/hostfiles/vlan706
dns/hostfiles/vlan706
+1
-1
dns/hostfiles/wfc
dns/hostfiles/wfc
+0
-0
dns/make.sh
dns/make.sh
+1
-1
dns/staticzones/net.020wireless.nl.db
dns/staticzones/net.020wireless.nl.db
+2
-2
netmap/layer1.dot
netmap/layer1.dot
+3
-3
netmap/layer1.svg
netmap/layer1.svg
+14
-14
No files found.
VLANS
View file @
8faae4cf
...
...
@@ -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)
...
...
dns/copy.sh
View file @
8faae4cf
...
...
@@ -2,7 +2,7 @@
.
paths.sh
HOSTS
=
"
stanleyH kalium wgrouter
"
HOSTS
=
"
bprouter soerel
"
cz
()
{
...
...
@@ -58,14 +58,8 @@ done
#
#echo "reload trashbat: "
#ssh root@trashbat /etc/init.d/bind9 reload
echo
"reload stanleyH: "
ssh root@stanleyH /etc/init.d/named reload
#echo "reload air traffic control: "
#ssh root@atc /etc/init.d/bind9 reload
echo
"reload kalium"
ssh root@kalium /etc/init.d/bind9 reload
ssh root@kalium host test.020
for
host
in
$HOSTS
;
do
ssh root@
$host
/etc/init.d/bind9 restart
done
ssh root@wgrouter /etc/init.d/bind9 reload
dns/hostfiles/amsw_tunnel
View file @
8faae4cf
...
...
@@ -12,7 +12,9 @@
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
10.205.252.13 bprouter
10.205.252.14 sofrouter
dns/hostfiles/forwardzones.conf
View file @
8faae4cf
...
...
@@ -15,5 +15,17 @@
# forwarders { 10.205.253.1; };
#};
zone
"lag"
{
type
forward
;
forward
only
;
forwarders
{
10
.
205
.
253
.
14
; };
};
#zone "30.205.10.IN-ADDR.ARPA" in {
# type forward;
# forward only;
# forwarders { 10.205.25.25; };
#};
include
"/etc/bind/zones/adm.conf"
;
dns/hostfiles/irl
View file @
8faae4cf
...
...
@@ -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
...
...
dns/hostfiles/routers
View file @
8faae4cf
...
...
@@ -9,11 +9,10 @@
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
10.205.253.14 bprouter
10.205.253.15 sofrouter
dns/hostfiles/transfernet
View file @
8faae4cf
...
...
@@ -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,50 +75,30 @@
# 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
10.205.255.55 broadcast-acta-techinc
# WFC -> ACTA vlan 15
# 10.205.255.56/31
10.205.255.56 acta-wfc-wfc # tec.rtr01.wfc.amsw.nl
10.205.255.57 acta-wfc-soerel # wfc.rtr01.tec.amsw.nl
# ACTA -> WFC vlan?
# access225.wfc.amsw.nl
# 10.205.255.56/29
10.205.255.56 net29-acta-wfc
10.205.255.57 acta-wfc-kalium #wfc.rtr-tec-01.amsw.nl
10.205.255.58 acta-wfc-stanleyh #wfc.rtr-tec-02.amsw.nl
10.205.255.59 acta-wfc-radio-acta #clientwfc.tec.amsw.nl
10.205.255.60 acta-wfc-radio-wfc
10.205.255.61 acta-wfc-router-wfc #access225.rtr-wfc-01.amsw.nl
10.205.255.62 nothing
10.205.255.63 acta-wfc-broadcast
10.205.255.58 acta-wfc-stanleyh-deprecated
# DWK -> GWL vlan?
# access294.dwk.amsw.nl
# 10.205.255.64/29
10.205.255.64 net29-dwk-gwl
10.205.255.65 dwk-gwl-router-gwl #dwk.rtr-gwl-01.amsw.nl
10.205.255.66 dwk-gwl-radio-gwl
10.205.255.67 dwk-gwl-radio-dwk #access294.dwk.amsw.nl
10.205.255.68 dwk-gwl-router-dwk #access294.rtr-dwk-01.amsw.nl
10.205.255.69 nothing
10.205.255.70 nothing
10.205.255.71 dwk-gwl-broadcast
# WFC -> GWL vlan 2
# 10.205.255.60/31
10.205.255.60 wfc-gwl-wfc # gwl.rtr01.wfc.amsw.nl
10.205.255.61 wfc-gwl-gwl # wfc.rtr01.gwl.amsw.nl
# WFC -> GWL vlan?
# 10.205.255.72/29
10.205.255.72 net29-wfc-gwl
10.205.255.73 wfc-gwl-router-wfc
10.205.255.74 wfc-gwl-radio-wfc
10.205.255.75 wfc-gwl-radio-gwl
10.205.255.76 wfc-gwl-router-gwl
10.205.255.77 nothing
10.205.255.78 nothing
10.205.255.79 wfc-gwl-broadcast
# DWK -> GWL vlan 2
# 10.205.255.62/31
10.205.255.62 dwk-gwl-dwk # gwl.rtr01.dwk.amsw.nl
10.205.255.63 dwk-gwl-gwl # dwk.rtr01.gwl.amsw.nl
# WFC -> LAG + SOF vlan?
# 10.205.255.80/28
...
...
dns/hostfiles/vlan1acta
View file @
8faae4cf
...
...
@@ -19,6 +19,6 @@
192.168.88.20 wfc-radio-to-acta
192.168.88.123
kalium
192.168.88.123
soerel
dns/hostfiles/vlan706
View file @
8faae4cf
...
...
@@ -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
dns/hostfiles/wfc
deleted
100644 → 0
View file @
56861628
dns/make.sh
View file @
8faae4cf
...
...
@@ -2,7 +2,7 @@
#set -e
.
paths.sh
HOSTS
=
"
stanleyH kalium
"
HOSTS
=
"
bprouter soerel
"
cz
()
{
...
...
dns/staticzones/net.020wireless.nl.db
View file @
8faae4cf
...
...
@@ -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
...
...
netmap/layer1.dot
View file @
8faae4cf
...
...
@@ -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> 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"
]
urrouter
[
label
=
"urrouter \n @waag? | <vlan201> 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
...
...
netmap/layer1.svg
View file @
8faae4cf
...
...
@@ -68,10 +68,10 @@
<g
id=
"edge11"
class=
"edge"
><title>
stanleyh:eth0
--
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"
/>
</g>
<!--
kalium
-->
<g
id=
"node4"
class=
"node"
><title>
kalium
</title>
<!--
soerel
-->
<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"
/>
<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=
"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 "
/>
...
...
@@ -83,12 +83,12 @@
<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>
</g>
<!--
kalium
--tinc_amsw -->
<g
id=
"edge2"
class=
"edge"
><title>
kalium
:tinc
--
tinc_amsw
</title>
<!--
soerel
--tinc_amsw -->
<g
id=
"edge2"
class=
"edge"
><title>
soerel
:tinc
--
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"
/>
</g>
<!--
kalium
--down -->
<g
id=
"edge10"
class=
"edge"
><title>
kalium
:eth0
--
down:2
</title>
<!--
soerel
--down -->
<g
id=
"edge10"
class=
"edge"
><title>
soerel
:eth0
--
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"
/>
</g>
<!-- ns0adm -->
...
...
@@ -592,10 +592,10 @@
<g
id=
"virtual_edge11"
class=
"edge"
><title>
stanleyh:eth0
--
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"
/>
</g>
<!--
kalium
-->
<g
id=
"virtual_node4_virtual"
class=
"node"
><title>
kalium
</title>
<!--
soerel
-->
<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"
/>
<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=
"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 "
/>
...
...
@@ -607,12 +607,12 @@
<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>
</g>
<!--
kalium
--tinc_amsw -->
<g
id=
"virtual_edge2"
class=
"edge"
><title>
kalium
:tinc
--
tinc_amsw
</title>
<!--
soerel
--tinc_amsw -->
<g
id=
"virtual_edge2"
class=
"edge"
><title>
soerel
:tinc
--
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"
/>
</g>
<!--
kalium
--down -->
<g
id=
"virtual_edge10"
class=
"edge"
><title>
kalium
:eth0
--
down:2
</title>
<!--
soerel
--down -->
<g
id=
"virtual_edge10"
class=
"edge"
><title>
soerel
:eth0
--
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"
/>
</g>
<!-- ns0adm -->
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment