aboutsummaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
Diffstat (limited to 'web')
-rw-r--r--web/etc/apache2/munin.tg15.gathering.org.conf (renamed from web/etc/apache2/munin.tg15.gathering.org)0
-rw-r--r--web/etc/apache2/nms-public.tg15.gathering.org.conf (renamed from web/etc/apache2/nms-public.tg15.gathering.org)0
-rw-r--r--web/etc/apache2/stats.tg15.gathering.org.conf (renamed from web/etc/apache2/stats.tg15.gathering.org)0
-rw-r--r--web/etc/apache2/stream.tg15.gathering.org.conf (renamed from web/etc/apache2/stream.tg15.gathering.org)0
-rw-r--r--web/etc/apache2/tech.tg15.gathering.org12
-rw-r--r--web/stream.gathering.org/.htaccess4
-rwxr-xr-xweb/stream.gathering.org/embed.pl2
-rwxr-xr-xweb/stream.gathering.org/generate_vlc.pl2
-rwxr-xr-xweb/stream.gathering.org/index.pl2
-rw-r--r--web/stream.gathering.org/streamlib/stream.pm (renamed from web/streamlib/stream.pm)0
-rw-r--r--web/stream.gathering.org/streamlib/stream/config.pm (renamed from web/streamlib/stream/config.pm)0
-rwxr-xr-xweb/tech.gathering.org/event-720p.mp4.pl11
-rw-r--r--web/tech.gathering.org/index.html20
-rw-r--r--web/tech.gathering.org/logo.pngbin19719 -> 0 bytes
-rw-r--r--web/tech.gathering.org/styles.css24
-rw-r--r--web/weathermap/tg15.conf325
16 files changed, 7 insertions, 395 deletions
diff --git a/web/etc/apache2/munin.tg15.gathering.org b/web/etc/apache2/munin.tg15.gathering.org.conf
index aaa3848..aaa3848 100644
--- a/web/etc/apache2/munin.tg15.gathering.org
+++ b/web/etc/apache2/munin.tg15.gathering.org.conf
diff --git a/web/etc/apache2/nms-public.tg15.gathering.org b/web/etc/apache2/nms-public.tg15.gathering.org.conf
index 6ca255d..6ca255d 100644
--- a/web/etc/apache2/nms-public.tg15.gathering.org
+++ b/web/etc/apache2/nms-public.tg15.gathering.org.conf
diff --git a/web/etc/apache2/stats.tg15.gathering.org b/web/etc/apache2/stats.tg15.gathering.org.conf
index 2dc99a4..2dc99a4 100644
--- a/web/etc/apache2/stats.tg15.gathering.org
+++ b/web/etc/apache2/stats.tg15.gathering.org.conf
diff --git a/web/etc/apache2/stream.tg15.gathering.org b/web/etc/apache2/stream.tg15.gathering.org.conf
index 1f92f47..1f92f47 100644
--- a/web/etc/apache2/stream.tg15.gathering.org
+++ b/web/etc/apache2/stream.tg15.gathering.org.conf
diff --git a/web/etc/apache2/tech.tg15.gathering.org b/web/etc/apache2/tech.tg15.gathering.org
deleted file mode 100644
index bf2840e..0000000
--- a/web/etc/apache2/tech.tg15.gathering.org
+++ /dev/null
@@ -1,12 +0,0 @@
-<VirtualHost *:80>
- ServerAdmin drift@gathering.org
- ServerName tech.tg15.gathering.org
-
- DocumentRoot /srv/www/tech.tg15.gathering.org
-
- LogLevel warn
- ErrorLog /var/log/apache2/error-tech.tg15.gathering.org.log
- CustomLog /var/log/apache2/access-tech.tg15.gathering.org.log combined
-
- AddHandler cgi-script .pl
-</VirtualHost>
diff --git a/web/stream.gathering.org/.htaccess b/web/stream.gathering.org/.htaccess
new file mode 100644
index 0000000..7a37cd3
--- /dev/null
+++ b/web/stream.gathering.org/.htaccess
@@ -0,0 +1,4 @@
+# Deny access to streamlib from web browser
+RewriteEngine On
+RewriteBase /
+RewriteRule ^streamlib.* - [F,L] \ No newline at end of file
diff --git a/web/stream.gathering.org/embed.pl b/web/stream.gathering.org/embed.pl
index bdd00eb..91fc413 100755
--- a/web/stream.gathering.org/embed.pl
+++ b/web/stream.gathering.org/embed.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -I /root/tgmanage/web/streamlib
+#!/usr/bin/perl -I /root/tgmanage/web/stream.gathering.org/streamlib
use warnings;
use strict;
use CGI;
diff --git a/web/stream.gathering.org/generate_vlc.pl b/web/stream.gathering.org/generate_vlc.pl
index 2b7ff04..178973d 100755
--- a/web/stream.gathering.org/generate_vlc.pl
+++ b/web/stream.gathering.org/generate_vlc.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -I /root/tgmanage/web/streamlib
+#!/usr/bin/perl -I /root/tgmanage/web/stream.gathering.org/streamlib
use warnings;
use strict;
diff --git a/web/stream.gathering.org/index.pl b/web/stream.gathering.org/index.pl
index e2bc165..cc83454 100755
--- a/web/stream.gathering.org/index.pl
+++ b/web/stream.gathering.org/index.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -I /root/tgmanage/web/streamlib
+#!/usr/bin/perl -I /root/tgmanage/web/stream.gathering.org/streamlib
use warnings;
use strict;
use CGI;
diff --git a/web/streamlib/stream.pm b/web/stream.gathering.org/streamlib/stream.pm
index c28136e..c28136e 100644
--- a/web/streamlib/stream.pm
+++ b/web/stream.gathering.org/streamlib/stream.pm
diff --git a/web/streamlib/stream/config.pm b/web/stream.gathering.org/streamlib/stream/config.pm
index 1c968da..1c968da 100644
--- a/web/streamlib/stream/config.pm
+++ b/web/stream.gathering.org/streamlib/stream/config.pm
diff --git a/web/tech.gathering.org/event-720p.mp4.pl b/web/tech.gathering.org/event-720p.mp4.pl
deleted file mode 100755
index 631e40d..0000000
--- a/web/tech.gathering.org/event-720p.mp4.pl
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env
-use strict;
-use warnings;
-use Capture::Tiny ':all';
-
-$! = 1;
-print "Content-Type: video/mp4\n\n";
-
-my ($stdout, $stderr) = tee {
- system('wget', '-qO-', 'http://stream.tg13.gathering.org:3013');
-};
diff --git a/web/tech.gathering.org/index.html b/web/tech.gathering.org/index.html
deleted file mode 100644
index 9a5b0ad..0000000
--- a/web/tech.gathering.org/index.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<html>
-<head>
-<title>Tech resources - The Gathering 2013</title>
-<link rel="stylesheet" type="text/css" href="/styles.css" media="all">
-</head>
-<body>
-
-<h1>Tech resources - The Gathering 2013</h1>
-
-<img id="logo" src="logo.png" alt="The Gathering 2013" />
-
-<h2><a href="http://stats.tg13.gathering.org">stats.tg13.gathering.org (weathermap)</a></h2>
-<h2><a href="http://nms-public.tg13.gathering.org">nms-public.tg13.gathering.org</a></h2>
-<h2><a href="http://stream.tg13.gathering.org">stream.tg13.gathering.org</a></h2>
-
-<h2><a href="http://techserver.gathering.org/ircrules">IRC rules for #tg@EFnet</a></h2>
-
-<p>Enjoy :-)</p>
-</body>
-</html>
diff --git a/web/tech.gathering.org/logo.png b/web/tech.gathering.org/logo.png
deleted file mode 100644
index 3a13cdf..0000000
--- a/web/tech.gathering.org/logo.png
+++ /dev/null
Binary files differ
diff --git a/web/tech.gathering.org/styles.css b/web/tech.gathering.org/styles.css
deleted file mode 100644
index e690989..0000000
--- a/web/tech.gathering.org/styles.css
+++ /dev/null
@@ -1,24 +0,0 @@
-* { font-family: 'Open Sans', sans-serif;
-
-}
-
-body {
- background: #fff; color: #000; opacity: 1;
-}
-
-#logo { background: url('logo.png'); width: 237px; height: 200px;position:absolute; top: 0; right: 0;z-index: -1}
-
-@media screen and (max-width: 1145px) { /* Min iPad size*/
- #spaceship {
- background: #fff;
- }
-}
-
-/* #innhold { position: absolute; left:0px ; top: 50px; margin: 0 50px 0 50px; z-index: 9; width: 520px; }*/
-#innhold { width: 480px; }
-footer { clear: both; width:480px; }
-a { color: #000; }
-h4 { margin: 0; margin-top: 35px;}
-p { margin: 0; padding: 0; }
-li { margin-bottom: 14px; }
-
diff --git a/web/weathermap/tg15.conf b/web/weathermap/tg15.conf
deleted file mode 100644
index e0a9420..0000000
--- a/web/weathermap/tg15.conf
+++ /dev/null
@@ -1,325 +0,0 @@
-# Automatically generated by php-weathermap v0.97c
-
-FONTDEFINE 100 docs/example/Vera.ttf 10
-
-BACKGROUND images/Weathermap_background.png
-WIDTH 1555
-HEIGHT 875
-HTMLSTYLE overlib
-KEYFONT 100
-TITLE The Gathering 2015 - The Future is Back
-TIMEPOS 746 17 Created: %b %d %Y %H:%M:%S
-
-KEYPOS DEFAULT 10 11 Traffic Load
-KEYTEXTCOLOR 0 0 0
-KEYOUTLINECOLOR 0 0 0
-KEYBGCOLOR 255 255 255
-BGCOLOR 255 255 255
-TITLECOLOR 0 0 0
-TIMECOLOR 0 0 0
-SCALE DEFAULT 0 0 204 204 204
-SCALE DEFAULT 0 1 255 255 255
-SCALE DEFAULT 1 10 118 66 135
-SCALE DEFAULT 10 25 77 133 178
-SCALE DEFAULT 25 40 130 186 235
-SCALE DEFAULT 40 55 0 209 133
-SCALE DEFAULT 55 70 247 171 125
-SCALE DEFAULT 70 85 255 105 41
-SCALE DEFAULT 85 100 232 20 23
-
-SET nowarn_clipping 1
-
-# End of global section
-
-
-# TEMPLATE-only NODEs:
-NODE DEFAULT
- LABELFONT 100
- MAXVALUE 100
-
-
-# TEMPLATE-only LINKs:
-LINK DEFAULT
- WIDTH 5
- BWFONT 100
- COMMENTFONT 100
- BWLABEL bits
- BANDWIDTH 10G
-
-
-# regular NODEs:
-NODE rs1.distro0
- LABEL rs1.distro0
- ICON images/rs-distro.png
- POSITION 451 312
-
-NODE rs1.distro1
- LABEL rs1.distro1
- ICON images/rs-distro.png
- POSITION 581 607
-
-NODE rs1.distro2
- LABEL rs1.distro2
- ICON images/rs-distro.png
- POSITION 642 265
-
-NODE rs1.distro3
- LABEL rs1.distro3
- ICON images/rs-distro.png
- POSITION 858 610
-
-NODE rs1.distro4
- LABEL rs1.distro4
- ICON images/rs-distro.png
- POSITION 1124 611
-
-NODE rs1.distro5
- LABEL rs1.distro5
- ICON images/rs-distro.png
- POSITION 1113 267
-
-NODE rs1.distro6
- LABEL rs1.distro6
- ICON images/rs-distro.png
- POSITION 1384 271
-
-NODE rs1.distro7
- LABEL rs1.distro7
- ICON images/rs-distro.png
- POSITION 1487 592
-
-NODE rs1.core
- LABEL rs1.core
- ICON images/rs1-core.png
- POSITION 1049 424
-
-NODE rs1.noc
- LABEL rs1.noc
- ICON images/rs1-noc.png
- POSITION 986 776
-
-NODE rs1.tele
- LABEL rs1.tele
- ICON images/rs1-tele.png
- POSITION 1533 727
-
-NODE rs1.south
- LABEL rs1.south
- ICON images/rs1-generic.png
- POSITION 1695 294
-
-NODE rs1.log
- LABEL rs1.log
- ICON images/rs1-generic.png
- POSITION 1230 107
-
-NODE rs1.backstage
- LABEL rs1.backstage
- ICON images/rs1-generic.png
- POSITION 858 179
-
-NODE rs1.gamehq
- LABEL rs1.gamehq
- ICON images/rs1-generic.png
- POSITION 610 108
-
-NODE fw1-tele
- LABEL fw1-tele
- ICON images/fw1-tele.png
- POSITION 1780 828
-
-NODE Interwebz
- LABEL Interwebz
- ICON images/Cloud-Filled.png
- POSITION 1576 922
-
-NODE rs1.crew
- LABEL rs1.crew
- ICON images/rs1-crew.png
- POSITION 1610 469
-
-NODE rs1.north
- LABEL rs1.north
- ICON images/rs1-generic.png
- POSITION 279 390
-
-
-# regular LINKs:
-LINK rs1.tele-rs1.south
- WIDTH 2
- INFOURL /cacti/graph.php?rra_id=all&local_graph_id=4272
- OVERLIBGRAPH /cacti/graph_image.php?local_graph_id=4272&rra_id=0&graph_nolegend=true&graph_height=100&graph_width=300
- TARGET /usr/share/cacti/site/rra/rs1_south_traffic_in_4275.rrd
- NODES rs1.south rs1.tele
- VIA 1704 533
-
-LINK rs1.log-rs1.south
- WIDTH 2
- INFOURL /cacti/graph.php?rra_id=all&local_graph_id=4274
- OVERLIBGRAPH /cacti/graph_image.php?local_graph_id=4274&rra_id=0&graph_nolegend=true&graph_height=100&graph_width=300
- TARGET /usr/share/cacti/site/rra/rs1_south_traffic_in_4277.rrd
- NODES rs1.south rs1.log
- VIA 1507 142
-
-LINK rs1.gamehq-rs1.log
- WIDTH 2
- INFOURL /cacti/graph.php?rra_id=all&local_graph_id=4450
- OVERLIBGRAPH /cacti/graph_image.php?local_graph_id=4450&rra_id=0&graph_nolegend=true&graph_height=100&graph_width=300
- TARGET /usr/share/cacti/site/rra/rs1_log_traffic_in_4455.rrd
- NODES rs1.gamehq rs1.log
-
-LINK rs1.backstage-rs1.log
- WIDTH 2
- INFOURL /cacti/graph.php?rra_id=all&local_graph_id=4454
- OVERLIBGRAPH /cacti/graph_image.php?local_graph_id=4454&rra_id=0&graph_nolegend=true&graph_height=100&graph_width=300
- TARGET /usr/share/cacti/site/rra/rs1_backstage_traffic_in_4459.rrd
- NODES rs1.backstage rs1.log
- VIA 1172 176
-
-LINK rs1.gamehq-rs1.north
- WIDTH 2
- INFOURL /cacti/graph.php?rra_id=all&local_graph_id=4394
- OVERLIBGRAPH /cacti/graph_image.php?local_graph_id=4394&rra_id=0&graph_nolegend=true&graph_height=100&graph_width=300
- TARGET /usr/share/cacti/site/rra/rs1_north_traffic_in_4397.rrd
- NODES rs1.gamehq rs1.north
- VIA 354 202
-
-LINK rs1.distro2-rs1.core
- WIDTH 4
- INFOURL /cacti/graph.php?rra_id=all&local_graph_id=1289
- OVERLIBGRAPH /cacti/graph_image.php?local_graph_id=1289&rra_id=0&graph_nolegend=true&graph_height=100&graph_width=300
- TARGET /usr/share/cacti/site/rra/rs1_distro2_traffic_in_1292.rrd
- NODES rs1.distro2 rs1.core
- VIA 852 367
- BANDWIDTH 20G
-
-LINK rs1.distro0-rs1.core
- WIDTH 4
- INFOURL /cacti/graph.php?rra_id=all&local_graph_id=4459
- OVERLIBGRAPH /cacti/graph_image.php?local_graph_id=4459&rra_id=0&graph_nolegend=true&graph_height=100&graph_width=300
- TARGET /usr/share/cacti/site/rra/rs1_core_traffic_in_4464.rrd
- NODES rs1.core rs1.distro0
- VIA 543 376
- BANDWIDTH 20G
-
-LINK rs1.distro5-rs1.core
- WIDTH 4
- INFOURL /cacti/graph.php?rra_id=all&local_graph_id=2610
- OVERLIBGRAPH /cacti/graph_image.php?local_graph_id=2610&rra_id=0&graph_nolegend=true&graph_height=100&graph_width=300
- TARGET /usr/share/cacti/site/rra/rs1_distro5_traffic_in_2613.rrd
- NODES rs1.distro5 rs1.core
- BANDWIDTH 20G
-
-LINK rs1.distro1-rs1.core
- WIDTH 4
- INFOURL /cacti/graph.php?rra_id=all&local_graph_id=4460
- OVERLIBGRAPH /cacti/graph_image.php?local_graph_id=4460&rra_id=0&graph_nolegend=true&graph_height=100&graph_width=300
- TARGET /usr/share/cacti/site/rra/rs1_core_traffic_in_4465.rrd
- NODES rs1.core rs1.distro1
- VIA 633 504
- BANDWIDTH 20G
-
-LINK rs1.distro3-rs1.core
- WIDTH 4
- INFOURL /cacti/graph.php?rra_id=all&local_graph_id=1649
- OVERLIBGRAPH /cacti/graph_image.php?local_graph_id=1649&rra_id=0&graph_nolegend=true&graph_height=100&graph_width=300
- TARGET /usr/share/cacti/site/rra/rs1_distro3_traffic_in_1652.rrd
- NODES rs1.distro3 rs1.core
- BANDWIDTH 20G
-
-LINK rs1.core-rs1.distro4
- WIDTH 4
- INFOURL /cacti/graph.php?rra_id=all&local_graph_id=2036
- OVERLIBGRAPH /cacti/graph_image.php?local_graph_id=2036&rra_id=0&graph_nolegend=true&graph_height=100&graph_width=300
- TARGET /usr/share/cacti/site/rra/rs1_distro4_traffic_in_2039.rrd
- NODES rs1.core rs1.distro4
- BANDWIDTH 20G
-
-LINK rs1.distro6-rs1.core
- WIDTH 4
- INFOURL /cacti/graph.php?rra_id=all&local_graph_id=4465
- OVERLIBGRAPH /cacti/graph_image.php?local_graph_id=4465&rra_id=0&graph_nolegend=true&graph_height=100&graph_width=300
- TARGET /usr/share/cacti/site/rra/rs1_core_traffic_in_4470.rrd
- NODES rs1.distro6 rs1.core
- VIA 1341 359
- BANDWIDTH 20G
-
-LINK rs1.distro7-rs1.core
- WIDTH 4
- INFOURL /cacti/graph.php?rra_id=all&local_graph_id=4466
- OVERLIBGRAPH /cacti/graph_image.php?local_graph_id=4466&rra_id=0&graph_nolegend=true&graph_height=100&graph_width=300
- TARGET /usr/share/cacti/site/rra/rs1_core_traffic_in_4471.rrd
- NODES rs1.distro7 rs1.core
- VIA 1354 521
- BANDWIDTH 20G
-
-LINK rs1.core-rs1.noc
- WIDTH 8
- INFOURL /cacti/graph.php?rra_id=all&local_graph_id=4467
- OVERLIBGRAPH /cacti/graph_image.php?local_graph_id=4467&rra_id=0&graph_nolegend=true&graph_height=100&graph_width=300
- TARGET /usr/share/cacti/site/rra/rs1_noc_traffic_in_4472.rrd
- NODES rs1.core rs1.noc
- VIA 1004 557
- BANDWIDTH 80G
-
-LINK rs1.noc-rs1.tele
- WIDTH 7
- INFOURL /cacti/graph.php?rra_id=all&local_graph_id=4468
- OVERLIBGRAPH /cacti/graph_image.php?local_graph_id=4468&rra_id=0&graph_nolegend=true&graph_height=100&graph_width=300
- TARGET /usr/share/cacti/site/rra/rs1_noc_traffic_in_4473.rrd
- NODES rs1.noc rs1.tele
- VIA 1302 784
- BANDWIDTH 80G
-
-LINK rs1.tele-fw1-tele
- WIDTH 4
- INFOURL /cacti/graph.php?rra_id=all&local_graph_id=4458
- OVERLIBGRAPH /cacti/graph_image.php?local_graph_id=4458&rra_id=0&graph_nolegend=true&graph_height=100&graph_width=300
- TARGET /usr/share/cacti/site/rra/rs1_core_traffic_in_4463.rrd
- NODES rs1.tele fw1-tele
-
-LINK rs1.tele-Interwebz
- WIDTH 7
- INFOURL /cacti/graph.php?rra_id=all&local_graph_id=4472
- OVERLIBGRAPH /cacti/graph_image.php?local_graph_id=4472&rra_id=0&graph_nolegend=true&graph_height=100&graph_width=300
- TARGET /usr/share/cacti/site/rra/rs1_tele_traffic_in_4477.rrd
- NODES rs1.tele Interwebz
- BANDWIDTH 30G
-
-LINK rs1.crew-rs1.core
- WIDTH 4
- INFOURL /cacti/graph.php?rra_id=all&local_graph_id=4456
- OVERLIBGRAPH /cacti/graph_image.php?local_graph_id=4456&rra_id=0&graph_nolegend=true&graph_height=100&graph_width=300
- TARGET /usr/share/cacti/site/rra/rs1_core_traffic_in_4461.rrd
- NODES rs1.crew rs1.core
- VIA 1445 449
- BANDWIDTH 20G
-
-LINK rs1.core-rs1.tele
- WIDTH 7
- INFOURL /cacti/graph.php?rra_id=all&local_graph_id=4457
- OVERLIBGRAPH /cacti/graph_image.php?local_graph_id=4457&rra_id=0&graph_nolegend=true&graph_height=100&graph_width=300
- TARGET /usr/share/cacti/site/rra/rs1_core_traffic_in_4462.rrd
- NODES rs1.core rs1.tele
- VIA 1373 643
- BANDWIDTH 80G
-
-LINK rs1.backstage-rs1.distro3
- WIDTH 2
- INFOURL /cacti/graph.php?rra_id=all&local_graph_id=4455
- OVERLIBGRAPH /cacti/graph_image.php?local_graph_id=4455&rra_id=0&graph_nolegend=true&graph_height=100&graph_width=300
- TARGET /usr/share/cacti/site/rra/rs1_backstage_traffic_in_4460.rrd
- NODES rs1.backstage rs1.distro3
- VIA 837 355
-
-LINK rs1.north-rs1.noc
- WIDTH 2
- INFOURL /cacti/graph.php?rra_id=all&local_graph_id=4475
- OVERLIBGRAPH /cacti/graph_image.php?local_graph_id=4475&rra_id=0&graph_nolegend=true&graph_height=100&graph_width=300
- TARGET /usr/share/cacti/site/rra/rs1_noc_traffic_in_4480.rrd
- NODES rs1.north rs1.noc
- VIA 389 679
-
-
-
-# That's All Folks!