aboutsummaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorJoachim Tingvold <joachim@tingvold.com>2016-03-25 15:51:28 +0100
committerroot <root@yoda.tg16.gathering.org>2016-03-25 16:35:40 +0100
commit23fabb7c1476a7f1ef3c00ff7e95eed4f7daa190 (patch)
tree425e30091d7a6d5bea23919e08511c197a5d2d67 /web
parent1670071c058a2676a4a880a93acd57b35d6dc24e (diff)
parent875f3e404537de55d5b03abd3b0b9bec58c34d49 (diff)
Merge branch 'master' of https://github.com/tech-server/tgmanage
Diffstat (limited to 'web')
-rw-r--r--web/etc/varnish/nms.vcl5
-rw-r--r--web/nms.gathering.org/js/nms-map-handlers.js2
-rw-r--r--web/stats.gathering.org/flute-smack.wavbin5591400 -> 0 bytes
-rw-r--r--web/stats.gathering.org/index.html29
-rw-r--r--web/stats.gathering.org/tg14_logo_rgb_normal.pngbin28344 -> 0 bytes
-rw-r--r--web/stats.gathering.org/weathermap-centered.html13
-rw-r--r--web/stats.gathering.org/weathermap-erlendo.html28
-rw-r--r--web/stats.gathering.org/weathermap.html25
-rw-r--r--web/stats.gathering.org/weathermap.pngbin643340 -> 0 bytes
9 files changed, 27 insertions, 75 deletions
diff --git a/web/etc/varnish/nms.vcl b/web/etc/varnish/nms.vcl
index 0cddebd..53a9444 100644
--- a/web/etc/varnish/nms.vcl
+++ b/web/etc/varnish/nms.vcl
@@ -37,6 +37,7 @@ sub vcl_recv {
return (hash);
}
+
# Rosa magi
sub vcl_hash {
# Wheee. Legg til authorization-headeren i hashen.
@@ -50,4 +51,8 @@ sub vcl_backend_response {
if (beresp.http.x-ban) {
ban("obj.http.x-url ~ " + beresp.http.x-ban);
}
+ if (beresp.status != 200) {
+ set beresp.uncacheable = false;
+ set beresp.ttl = 5s;
+ }
}
diff --git a/web/nms.gathering.org/js/nms-map-handlers.js b/web/nms.gathering.org/js/nms-map-handlers.js
index 868d26d..474e8ef 100644
--- a/web/nms.gathering.org/js/nms-map-handlers.js
+++ b/web/nms.gathering.org/js/nms-map-handlers.js
@@ -383,7 +383,7 @@ function dhcpUpdater()
}
try {
for (var sw in nmsData.switches.switches) {
- var c = "white";
+ var c = blue;
if (nmsData.dhcp.dhcp[sw] == undefined) {
nmsMap.setSwitchColor(sw,c);
continue;
diff --git a/web/stats.gathering.org/flute-smack.wav b/web/stats.gathering.org/flute-smack.wav
deleted file mode 100644
index 36c9f31..0000000
--- a/web/stats.gathering.org/flute-smack.wav
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index cc6bca6..0000000
--- a/web/stats.gathering.org/tg14_logo_rgb_normal.png
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index 123883f..0000000
--- a/web/stats.gathering.org/weathermap.png
+++ /dev/null
Binary files differ
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-03 07:30:18 +0000