aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoachim Tingvold <joachim@tingvold.com>2015-04-01 03:36:58 +0200
committerroot <root@einstein.tg15.gathering.org>2015-04-01 03:36:58 +0200
commit132fc7e577c591caa290b3d7f44700ef77f2b3f7 (patch)
tree82db74aff709daffa2b0dcaff0ca71f75c299831
parent250444f4ca039de57bba64edbfd9cd73d5920a59 (diff)
More changes for TG15.
-rw-r--r--netlist.txt42
-rw-r--r--patchlist.txt8
-rw-r--r--switches.txt8
3 files changed, 47 insertions, 11 deletions
diff --git a/netlist.txt b/netlist.txt
index b87423b..1a8a11d 100644
--- a/netlist.txt
+++ b/netlist.txt
@@ -1,24 +1,44 @@
## start manuelle nett
-151.216.227.0/24 2a02:ed02:227::/64 fugleberget1
-151.216.229.0/24 2a02:ed02:229::/64 game
-151.216.254.0/24 2a02:ed02:254::/64 noc
-151.216.224.0/24 2a02:ed02:224::/64 logistikk
-151.216.234.0/24 2a02:ed02:234::/64 lounge
-151.216.192.0/19 2a02:ed02:192::/64 tg15-wlan
-151.216.249.0/26 2a02:ed02:249a::/64 southcam
-151.216.241.0/24 2a02:ed02:241::/64 motell
-151.216.240.0/24 2a02:ed02:240::/64 studio
+151.216.170.0/24 2a02:ed02:170::/64 crew
151.216.178.0/26 2a02:ed02:178a::/64 ap-distro0
-151.216.178.64/26 2a02:ed02:178b::/64 ap-distro1
151.216.178.128/26 2a02:ed02:178c::/64 ap-distro2
151.216.178.192/26 2a02:ed02:178d::/64 ap-distro3
+151.216.178.64/26 2a02:ed02:178b::/64 ap-distro1
151.216.179.0/26 2a02:ed02:179a::/64 ap-distro4
-151.216.179.64/26 2a02:ed02:179b::/64 ap-distro5
151.216.179.128/26 2a02:ed02:179c::/64 ap-distro6
151.216.179.192/26 2a02:ed02:179d::/64 ap-distro7
+151.216.179.64/26 2a02:ed02:179b::/64 ap-distro5
+151.216.192.0/19 2a02:ed02:192::/64 tg15-wlan
+151.216.224.0/24 2a02:ed02:224::/64 logistikk
+151.216.226.0/24 2a02:ed02:226::/64 presse
+151.216.227.0/24 2a02:ed02:227::/64 fugleberget1
+151.216.229.0/24 2a02:ed02:229::/64 game
+151.216.230.0/24 2a02:ed02:230::/64 infodesk
+151.216.232.0/24 2a02:ed02:232::/64 resepsjon
+151.216.233.0/24 2a02:ed02:233::/64 sponsor
+151.216.234.0/24 2a02:ed02:234::/64 lounge
+151.216.235.0/24 2a02:ed02:235::/64 stage
+151.216.236.0/24 2a02:ed02:236::/64 medic
+151.216.237.0/24 2a02:ed02:237::/64 gamecrew
+151.216.240.0/24 2a02:ed02:240::/64 studio
+151.216.241.0/24 2a02:ed02:241::/64 motell
+151.216.243.0/24 2a02:ed02:243::/64 nextron
+151.216.244.0/24 2a02:ed02:244::/64 event-north
+151.216.249.0/26 2a02:ed02:249a::/64 southcam
+151.216.254.0/24 2a02:ed02:254::/64 noc
## slutt manuelle nett
# make netlist.txt from switches.txt;
# cat switches.txt | perl -lne '($n,$v4,$v6)=split;print "$v4 $v6 $n";'
+## start creativia
+151.216.166.0/26 2a02:ed02:166a::/64 creativia1
+151.216.166.64/26 2a02:ed02:166b::/64 creativia2
+151.216.166.128/26 2a02:ed02:166c::/64 creativia3
+151.216.166.192/26 2a02:ed02:166d::/64 creativia4
+151.216.167.0/26 2a02:ed02:167a::/64 creativia5
+151.216.167.64/26 2a02:ed02:167b::/64 creativia6
+151.216.167.128/26 2a02:ed02:167c::/64 creativia7
+151.216.167.192/26 2a02:ed02:167d::/64 creativia8
+## slutt creativia
## start switches.txt
151.216.129.0/26 2a02:ed02:129a::/64 e1-3
151.216.129.64/26 2a02:ed02:129b::/64 e3-3
diff --git a/patchlist.txt b/patchlist.txt
index b7806f5..3f73092 100644
--- a/patchlist.txt
+++ b/patchlist.txt
@@ -138,3 +138,11 @@ e81-1 distro7 ge-0/0/18 ge-1/0/18 ge-2/0/18 ge-3/0/18
e81-2 distro7 ge-0/0/19 ge-1/0/19 ge-2/0/19 ge-3/0/19
e83-1 distro7 ge-0/0/20 ge-1/0/20 ge-2/0/20 ge-3/0/20
e83-2 distro7 ge-0/0/21 ge-1/0/21 ge-2/0/21 ge-3/0/21
+sw1-creativia distro6 ge-0/0/18 ge-1/0/18
+sw2-creativia distro6 ge-0/0/19 ge-1/0/19
+sw3-creativia distro6 ge-0/0/20 ge-1/0/20
+sw4-creativia distro6 ge-0/0/21 ge-1/0/21
+sw5-creativia distro6 ge-0/0/22 ge-1/0/22
+sw6-creativia distro6 ge-0/0/23 ge-1/0/23
+sw7-creativia distro6 ge-0/0/24 ge-1/0/24
+sw8-creativia distro6 ge-0/0/25 ge-1/0/25
diff --git a/switches.txt b/switches.txt
index f8eed5d..c9ea727 100644
--- a/switches.txt
+++ b/switches.txt
@@ -138,3 +138,11 @@ e81-1 151.216.163.128/26 2a02:ed02:163c::/64 151.216.181.212/26 2a02:ed02:181d::
e81-2 151.216.163.192/26 2a02:ed02:163d::/64 151.216.181.213/26 2a02:ed02:181d::213/64 1812 distro7
e83-1 151.216.164.0/26 2a02:ed02:164a::/64 151.216.181.214/26 2a02:ed02:181d::214/64 1831 distro7
e83-2 151.216.164.64/26 2a02:ed02:164b::/64 151.216.181.215/26 2a02:ed02:181d::215/64 1832 distro7
+sw1-creativia 151.216.166.0/26 2a02:ed02:166a::/64 151.216.181.148/26 2a02:ed02:181c::148/64 2001 distro6
+sw2-creativia 151.216.166.64/26 2a02:ed02:166b::/64 151.216.181.149/26 2a02:ed02:181c::149/64 2002 distro6
+sw3-creativia 151.216.166.128/26 2a02:ed02:166c::/64 151.216.181.150/26 2a02:ed02:181c::150/64 2003 distro6
+sw4-creativia 151.216.166.192/26 2a02:ed02:166d::/64 151.216.181.151/26 2a02:ed02:181c::151/64 2004 distro6
+sw5-creativia 151.216.167.0/26 2a02:ed02:167a::/64 151.216.181.152/26 2a02:ed02:181c::152/64 2005 distro6
+sw6-creativia 151.216.167.64/26 2a02:ed02:167b::/64 151.216.181.153/26 2a02:ed02:181c::153/64 2006 distro6
+sw7-creativia 151.216.167.128/26 2a02:ed02:167c::/64 151.216.181.154/26 2a02:ed02:181c::154/64 2007 distro6
+sw8-creativia 151.216.167.192/26 2a02:ed02:167d::/64 151.216.181.155/26 2a02:ed02:181c::155/64 2008 distro6