aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoachim Tingvold <joachim@tingvold.com>2016-03-02 23:41:57 +0100
committerJoachim Tingvold <joachim@tingvold.com>2016-03-02 23:43:48 +0100
commit2c625018a15e628f82e91126eb544d7af4dd5088 (patch)
tree44a61e43047765bc7b2630fdb39300743d22db96
parent559267d660f41e2e0f1119e59d4350be48071923 (diff)
Cleaned up some.
-rw-r--r--examples/tg13/etc/apache2/tech.tg15.gathering.org.conf (renamed from web/etc/apache2/tech.tg15.gathering.org)0
-rwxr-xr-xexamples/tg13/web/tech.gathering.org/event-720p.mp4.pl (renamed from web/tech.gathering.org/event-720p.mp4.pl)0
-rw-r--r--examples/tg13/web/tech.gathering.org/index.html (renamed from web/tech.gathering.org/index.html)0
-rw-r--r--examples/tg13/web/tech.gathering.org/logo.png (renamed from web/tech.gathering.org/logo.png)bin19719 -> 19719 bytes
-rw-r--r--examples/tg13/web/tech.gathering.org/styles.css (renamed from web/tech.gathering.org/styles.css)0
-rw-r--r--examples/tg15/weathermap.conf (renamed from web/weathermap/tg15.conf)0
-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/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
16 files changed, 7 insertions, 3 deletions
diff --git a/web/etc/apache2/tech.tg15.gathering.org b/examples/tg13/etc/apache2/tech.tg15.gathering.org.conf
index bf2840e..bf2840e 100644
--- a/web/etc/apache2/tech.tg15.gathering.org
+++ b/examples/tg13/etc/apache2/tech.tg15.gathering.org.conf
diff --git a/web/tech.gathering.org/event-720p.mp4.pl b/examples/tg13/web/tech.gathering.org/event-720p.mp4.pl
index 631e40d..631e40d 100755
--- a/web/tech.gathering.org/event-720p.mp4.pl
+++ b/examples/tg13/web/tech.gathering.org/event-720p.mp4.pl
diff --git a/web/tech.gathering.org/index.html b/examples/tg13/web/tech.gathering.org/index.html
index 9a5b0ad..9a5b0ad 100644
--- a/web/tech.gathering.org/index.html
+++ b/examples/tg13/web/tech.gathering.org/index.html
diff --git a/web/tech.gathering.org/logo.png b/examples/tg13/web/tech.gathering.org/logo.png
index 3a13cdf..3a13cdf 100644
--- a/web/tech.gathering.org/logo.png
+++ b/examples/tg13/web/tech.gathering.org/logo.png
Binary files differ
diff --git a/web/tech.gathering.org/styles.css b/examples/tg13/web/tech.gathering.org/styles.css
index e690989..e690989 100644
--- a/web/tech.gathering.org/styles.css
+++ b/examples/tg13/web/tech.gathering.org/styles.css
diff --git a/web/weathermap/tg15.conf b/examples/tg15/weathermap.conf
index e0a9420..e0a9420 100644
--- a/web/weathermap/tg15.conf
+++ b/examples/tg15/weathermap.conf
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/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