diff options
| -rwxr-xr-x | tools/generate-dnsrr.pl | 5 | ||||
| -rwxr-xr-x | tools/generate-rowdns.pl | 2 | ||||
| -rwxr-xr-x | tools/make-linknet-hosts.pl | 36 | ||||
| -rw-r--r-- | web/stats.gathering.org/flute-smack.wav | bin | 5591400 -> 0 bytes | |||
| -rw-r--r-- | web/stats.gathering.org/index.html | 29 | ||||
| -rw-r--r-- | web/stats.gathering.org/tg14_logo_rgb_normal.png | bin | 28344 -> 0 bytes | |||
| -rw-r--r-- | web/stats.gathering.org/weathermap-centered.html | 13 | ||||
| -rw-r--r-- | web/stats.gathering.org/weathermap-erlendo.html | 28 | ||||
| -rw-r--r-- | web/stats.gathering.org/weathermap.html | 25 | ||||
| -rw-r--r-- | web/stats.gathering.org/weathermap.png | bin | 643340 -> 0 bytes |
10 files changed, 50 insertions, 88 deletions
diff --git a/tools/generate-dnsrr.pl b/tools/generate-dnsrr.pl index ad9230c..99ff395 100755 --- a/tools/generate-dnsrr.pl +++ b/tools/generate-dnsrr.pl @@ -19,6 +19,9 @@ # Command-syntax to send this to nsupdate, running it on the DNS server: # cat file.txt | tools/generate-dnsrr.pl --dom foo -ns | ssh $dnsserver "nsupdate -k /etc/bind/Kdhcp_updater.+157+XXXXX" # +# Generate DNS for linknets: +# cat /tmp/linknets.txt | perl -wple 's,;, ,g' | perl tools/make-linknet-hosts.pl | tools/generate-dnsrr.pl --domain tgXX.gathering.org -ns -rev | ssh $dnsserver "nsupdate -k /etc/bind/Kdhcp_updater.XXXXX" +# # Format of input: # hostname ipv4-adress ipv6-address # If any of ipv4-address or ipv6-address are NOT set for the host, specify "nope" @@ -99,7 +102,6 @@ sub print_ptr{ unless ( $ipv4 eq "nope" ) { my $v4 = new Net::IP($ipv4); - print "prereq nxdomain " . $v4->reverse_ip() . "\n" unless $delete; print "update add " . $v4->reverse_ip() . " 3600 IN PTR " . $hostname . $domain .".\n" unless $delete; print "update delete " . $v4->reverse_ip() . " IN PTR\n" if $delete; print "send\n"; @@ -109,7 +111,6 @@ sub print_ptr{ if (( not ($ipv6 eq "nope") ) && ( $ipv6 )) { my $v6 = new Net::IP($ipv6); - print "prereq nxdomain " . $v6->reverse_ip() . "\n" unless $delete; print "update add " . $v6->reverse_ip() . " 3600 IN PTR " . $hostname . $domain . ".\n" unless $delete; print "update delete " . $v6->reverse_ip() . " IN PTR\n" if $delete; print "send\n"; diff --git a/tools/generate-rowdns.pl b/tools/generate-rowdns.pl index 075cae0..a7b9aef 100755 --- a/tools/generate-rowdns.pl +++ b/tools/generate-rowdns.pl @@ -99,4 +99,4 @@ if($json_content){ } print "send\n"; } -}
\ No newline at end of file +} diff --git a/tools/make-linknet-hosts.pl b/tools/make-linknet-hosts.pl index 1db630a..c00e81b 100755 --- a/tools/make-linknet-hosts.pl +++ b/tools/make-linknet-hosts.pl @@ -24,21 +24,35 @@ while (<STDIN>) { my ($ipv4_raw, $ipv6_raw, $from, $to) = split; - # v4 - my $ipv4_first = NetAddr::IP->new($ipv4_raw); - my $ipv4_second = $ipv4_first + 1; - - # v6 - my $ipv6_first = NetAddr::IP->new($ipv6_raw); - my $ipv6_second = $ipv6_first + 1; + my ($ipv4_first, $ipv4_second, $ipv6_first, $ipv6_second); + if($ipv6_raw =~ m/nope/){ + $ipv6_first = "nope"; + $ipv6_second = "nope"; + } else { + my $ipv6 = NetAddr::IP->new($ipv6_raw); + $ipv6_first = $ipv6->addr(); + $ipv6++; + $ipv6_second = $ipv6->addr(); + } + + if($ipv4_raw =~ m/nope/){ + $ipv4_first = ""; + $ipv4_second = ""; + } else { + my $ipv4 = NetAddr::IP->new($ipv4_raw); + $ipv4_first = $ipv4->addr(); + $ipv4++; + $ipv4_second = $ipv4->addr; + } + # generate-dnsrr.pl format: # hostname ipv4 ipv6 if($first){ - printf("%s %s %s\n", $from, $ipv4_first->addr, $ipv6_first->addr); - printf("%s %s %s\n", $to, $ipv4_second->addr, $ipv6_second->addr); + printf("%s %s %s\n", $from, $ipv4_first, $ipv6_first); + printf("%s %s %s\n", $to, $ipv4_second, $ipv6_second); } else { - printf("%s-%s %s %s\n", $from, $to, $ipv4_first->addr, $ipv6_first->addr); - printf("%s-%s %s %s\n", $to, $from, $ipv4_second->addr, $ipv6_second->addr); + printf("%s-%s %s %s\n", $from, $to, $ipv4_first, $ipv6_first); + printf("%s-%s %s %s\n", $to, $from, $ipv4_second, $ipv6_second); } } diff --git a/web/stats.gathering.org/flute-smack.wav b/web/stats.gathering.org/flute-smack.wav Binary files differdeleted file mode 100644 index 36c9f31..0000000 --- a/web/stats.gathering.org/flute-smack.wav +++ /dev/null diff --git a/web/stats.gathering.org/index.html b/web/stats.gathering.org/index.html index 7bd8b7c..2a9d1f0 100644 --- a/web/stats.gathering.org/index.html +++ b/web/stats.gathering.org/index.html @@ -1,23 +1,36 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> -<title>stats.tg15.gathering..org</title> +<title>stats.tg16.gathering..org</title> <style type="text/css"> @import url(index.css); </style> </head> <body> -<h1>stats.tg15.gathering.org</h1> +<h1>stats.tg16.gathering.org</h1> <br /> <ul id="menu"> - <li><a href="http://nms-public.tg15.gathering.org/weathermap.pl">Weathermap</a></li> - <li><a href="http://funfact.tg15.gathering.org/">Internet utilization</a></li> - <li><a href="http://nms-public.tg15.gathering.org/dhcpkart.html">DHCP-map</a></li> - <li><a href="http://nms-public.tg15.gathering.org/ping.html">Ping live!</a></li> - <li><a href="http://nms-public.tg15.gathering.org/tempkart.html">Tempkart</a></li> - <li><a href="http://nms-public.tg15.gathering.org/ping2.html">Switchtrafikk live!</a></li> + <li><a href="https://nms-public.tg16.gathering.org/">Public NMS</a></li> + <li><a href="https://github.com/tech-server/tgmanage/blob/master/web/nms.gathering.org/api/API.rst">Public NMS API documentation</a></li> + <li><a href="https://nms-public.tg16.gathering.org/api/public/ping/">NMS API: ping</a></li> + <li><a href="https://nms-public.tg16.gathering.org/api/public/switches/">NMS API: switches</a></li> + <li><a href="https://nms-public.tg16.gathering.org/api/public/switch-state/">NMS API: switch-state</a></li> + <li><a href="https://nms-public.tg16.gathering.org/api/public/dhcp/">NMS API: dhcp</a></li> + <li><a href="https://nms-public.tg16.gathering.org/api/public/dhcp-summary/">NMS API: dhcp-summary</a></li> +</ul> + +<br /> +<br /> +<br /> +<br /> + +<h2>third-party stats (using NMS API)</h1> +<br /> +<ul id="menu"> + <li><a href="http://tg16.sorlanet.net/TG16.html">Weathermap</a></li> + <li><a href="http://tg16.sorlanet.net:3000">Live network stats</a></li> </ul> <br /> diff --git a/web/stats.gathering.org/tg14_logo_rgb_normal.png b/web/stats.gathering.org/tg14_logo_rgb_normal.png Binary files differdeleted file mode 100644 index cc6bca6..0000000 --- a/web/stats.gathering.org/tg14_logo_rgb_normal.png +++ /dev/null diff --git a/web/stats.gathering.org/weathermap-centered.html b/web/stats.gathering.org/weathermap-centered.html deleted file mode 100644 index 5cc3eee..0000000 --- a/web/stats.gathering.org/weathermap-centered.html +++ /dev/null @@ -1,13 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> -<meta http-equiv="refresh" content="60" /> -<title>Network Weathermap</title> -</head> -<body> -<div style="text-align:center;"> -<h1 style="font-size:50px; font-family: arial">Network Weathermap</h1> -<img id="wmapimage" src="http://nms-public.tg14.gathering.org/weathermap/weathermap.png" border="0" /> -</div> -</body> -</html> diff --git a/web/stats.gathering.org/weathermap-erlendo.html b/web/stats.gathering.org/weathermap-erlendo.html deleted file mode 100644 index 1883341..0000000 --- a/web/stats.gathering.org/weathermap-erlendo.html +++ /dev/null @@ -1,28 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> - <meta http-equiv="refresh" content="60" /> - <title>Network weathermap</title> - <link rel="stylesheet" type="text/css" href="http://151.216.253.14:8000/en-US/static/@204106/css/bootstrap.min.css" /> - <link rel="stylesheet" type="text/css" media="all" href="http://151.216.253.14:8000/en-US/static/@204106/css/pages/dashboard-simple-bootstrap.min.css" /> - <link rel="stylesheet" type="text/css" media="all" href="http://151.216.253.14:8000/en-US/static/@204106/app/search/dashboard.css" /> - <style> -body{background:#ffffff;} - </style> -</head> -<body class="simplexml"> - <audio autoplay="autoplay"> - <source src="flute-smack.wav" type="audio/mpeg"> - </audio> - <div class="dashboard-header clearfix"> - <div style="text-align: center;"> - <div style="position: relative; left: 0; top: 0;"> - <br \><br \><br \><br \><br \><br \><br \><br \><br \><br \> - <h1 style="z-index:10; position:relative;">Network weathermap</h1> - <img src="http://stats.tg14.gathering.org/weathermap.png" border="0" style="z-index:4; position: relative; top: 0; left: 0; margin-top: 0px;"/> - <img src="http://151.216.253.14/tg14_logo_rgb_normal.png" style="z-index:5; position: absolute; top: 50px; left: 50%; width: 546px; margin-left: -273px; margin-top: -50px;"/> - </div> - </div> - </div> -</body> -</html> diff --git a/web/stats.gathering.org/weathermap.html b/web/stats.gathering.org/weathermap.html deleted file mode 100644 index 1a394d2..0000000 --- a/web/stats.gathering.org/weathermap.html +++ /dev/null @@ -1,25 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> - <meta http-equiv="refresh" content="60" /> - <title>Network weathermap</title> - <link rel="stylesheet" type="text/css" href="http://151.216.253.14:8000/en-US/static/@204106/css/bootstrap.min.css" /> - <link rel="stylesheet" type="text/css" media="all" href="http://151.216.253.14:8000/en-US/static/@204106/css/pages/dashboard-simple-bootstrap.min.css" /> - <link rel="stylesheet" type="text/css" media="all" href="http://151.216.253.14:8000/en-US/static/@204106/app/search/dashboard.css" /> - <style> -body{background:#ffffff;} - </style> -</head> -<body class="simplexml"> - <div class="dashboard-header clearfix"> - <div style="text-align: center;"> - <div style="position: relative; left: 0; top: 0;"> - <br \><br \><br \><br \><br \><br \><br \><br \><br \><br \> - <h1 style="z-index:10; position:relative;">Network weathermap</h1> - <img src="http://nms-public.tg14.gathering.org/weathermap/weathermap.png" border="0" style="z-index:4; position: relative; top: 0; left: 0; margin-top: -80px;"/> - <img src="http://151.216.253.14/tg14_logo_rgb_normal.png" style="z-index:5; position: absolute; top: 50px; left: 50%; width: 546px; margin-left: -273px; margin-top: -50px;"/> - </div> - </div> - </div> -</body> -</html> diff --git a/web/stats.gathering.org/weathermap.png b/web/stats.gathering.org/weathermap.png Binary files differdeleted file mode 100644 index 123883f..0000000 --- a/web/stats.gathering.org/weathermap.png +++ /dev/null |
