Lots of TG15-changes (-:

author: root <root@einstein.tg15.gathering.org> 2015-03-31 04:39:50 +0200
committer: root <root@einstein.tg15.gathering.org> 2015-03-31 04:39:50 +0200
commit: e3d7c5cc86fedb458d9b091ca12245c01e7f285d (patch)
tree: e6e2dd92505d972e8a0d4e28160eb4657416dfcd /web
parent: aff65378ea1ae556dbccc9a2f97a97811c86c39d (diff)
10 files changed, 130 insertions, 40 deletions
diff --git a/web/etc/apache2/nms-public.tg15.gathering.org b/web/etc/apache2/nms-public.tg15.gathering.org
index 4ebf79b..4c4798c 100644
--- a/web/etc/apache2/nms-public.tg15.gathering.org
+++ b/web/etc/apache2/nms-public.tg15.gathering.org
@@ -1,4 +1,4 @@
-<VirtualHost *:80>
+<VirtualHost *:8080>
         ServerAdmin drift@gathering.org
         ServerName nms-public.tg15.gathering.org
 
diff --git a/web/etc/apache2/nms.tg15.gathering.org b/web/etc/apache2/nms.tg15.gathering.org
index fc0cee4..e177d44 100644
--- a/web/etc/apache2/nms.tg15.gathering.org
+++ b/web/etc/apache2/nms.tg15.gathering.org
@@ -1,4 +1,4 @@
-<VirtualHost *:80>
+<VirtualHost *:8080>
         ServerAdmin drift@gathering.org
         ServerName nms.tg15.gathering.org
         ServerAlias einstein.tg15.gathering.org
@@ -7,12 +7,6 @@
         <Directory "/root/tgmanage/web/nms.gathering.org">
                 AllowOverride None
                 Options Indexes FollowSymLinks ExecCGI MultiViews
-                Order allow,deny
-		Satisfy any
-                Allow from ::1
-                Allow from 127.0.0.1
-		Allow from 151.216.254.201/24
-		Allow from 2a02:ed02:254::0/64
 
                 AddHandler cgi-script .cgi .sh .pl .py
                 AddDefaultCharset UTF-8
diff --git a/web/etc/apache2/stream.tg15.gathering.org b/web/etc/apache2/stream.tg15.gathering.org
index a7c0dda..52d879c 100644
--- a/web/etc/apache2/stream.tg15.gathering.org
+++ b/web/etc/apache2/stream.tg15.gathering.org
@@ -1,4 +1,4 @@
- <VirtualHost *:80>
+ <VirtualHost *:8080>
         ServerAdmin drift@gathering.org
         ServerName stream.tg15.gathering.org
         ServerAlias krosus.tg15.gathering.org
@@ -9,9 +9,9 @@
                 Options Indexes FollowSymLinks ExecCGI MultiViews
                 Order allow,deny
                 Allow from all
+		Require all granted
                 AddHandler cgi-script .cgi .sh .pl .py
                 AddDefaultCharset UTF-8
-
         </Directory>
 
         ErrorLog /var/log/apache2/error-stream.tg15.gathering.org.log
diff --git a/web/stream.gathering.org/embed.pl b/web/stream.gathering.org/embed.pl
index e5f103c..38fbf9c 100644..100755
--- a/web/stream.gathering.org/embed.pl
+++ b/web/stream.gathering.org/embed.pl
@@ -26,7 +26,7 @@ my $location = undef;
 print $client->header();
 
 my $clip = $client->remote_addr();
-my $template = HTML::Template->new(filename => 'index.tmpl');
+my $template = HTML::Template->new(filename => 'embed.tmpl');
 my $is_local = &is_ip_local($clip, $v4net, $v6net);
 
 my @streams = &html_local_test();
@@ -52,11 +52,8 @@ sub html_local_test() {
 		my %hash = (
 			'title_link' => $title_link,
 			'title' => $streams{$name}->{title},
-			'source' => $streams{$name}->{source},
 			'quality' => $streams{$name}->{quality},
-			'location' => $streams{$name}->{location},
 			'type' => $streams{$name}->{type},
-			'delivery' => $multicast_link,
 		);
 		if ($multicast_link eq "multicast") {
 			$hash{'is_multicast'} .= 1; 
diff --git a/web/stream.gathering.org/embed.tmpl b/web/stream.gathering.org/embed.tmpl
index ef8b692..6b9581b 100644
--- a/web/stream.gathering.org/embed.tmpl
+++ b/web/stream.gathering.org/embed.tmpl
@@ -1,18 +1,18 @@
 <html>
 <head>
 	<title>The Gathering <TMPL_VAR NAME=TG_FULL> Streams</title>
-	<link rel="stylesheet" type="text/css" href="style.css" media="all">
-	<script type="text/javascript" src="jwplayer.js"></script> 
+	<link rel="stylesheet" type="text/css" href="pre-tg15/style.css" media="all">
+	<script type="text/javascript" src="pre-tg15/jwplayer.js"></script> 
 </head>
 <body>
 	<div id="innhold">
 		<TMPL_UNLESS NAME=NOHEADER>
 			<h1>The Gathering <TMPL_VAR NAME=TG_FULL> Streams</h1>
-			<embed type="application/x-shockwave-flash" src="player.swf"
+			<embed type="application/x-shockwave-flash" src="pre-tg15/player.swf"
 				width="800" height="450" style="undefined" id="mplf" name="mplf" quality="high"
 				allowfullscreen="true" allowscriptaccess="always" wmode="opaque"
 				stretching="exactfit"
-				flashvars="stretching=exactfit&amp;file=<TMPL_VAR NAME=VLC_BASE_HOST>/event.flv&amp;autostart=true"></embed>
+				flashvars="stretching=exactfit&amp;file=http://wat.gathering.org:9094/southcam.flv&amp;autostart=true"></embed>
 			<p>&nbsp;</p>
 		</TMPL_UNLESS>
 		
@@ -30,7 +30,7 @@
 	</div>
 
 
-	<p>Problems with the non game streams? The easiest way to get hold of us is on IRC (EFNet); one of ViD or doxid should be available if there's too much traffic on #tg to be heard.</p>
+	<p>Problems with the non game streams? The easiest way to get a hold of us is on IRC (EFNet); Either of ViD or DoXiD should be available if there's too much traffic on #tg to be heard.</p>
 	<p><a target="_blank" href="http://stream.tg<TMPL_VAR NAME="TG">.gathering.org">http://stream.tg<TMPL_VAR NAME="TG">.gathering.org</a></p>
 
 </body>
diff --git a/web/stream.gathering.org/index.tmpl b/web/stream.gathering.org/index.tmpl
index 8d007e9..c834da9 100644
--- a/web/stream.gathering.org/index.tmpl
+++ b/web/stream.gathering.org/index.tmpl
@@ -37,19 +37,44 @@
 		function swapVideo (url) {
 			window.location = '/?url=' + window.btoa(url);
 		}
+
+		function float() {
+			$("#floater").animate({top: '-=20px'}, "slow");
+			$("#floater").animate({top: '+=20px'}, "slow");
+			float();
+		}
+
+		$(document).ready(function() {
+			float();
+		});
 	</script>
 
+	<style type="text/css">
+		#floater {
+			position: absolute;
+			top: 172px;
+			right: 0px;
+			width: 531px;
+			height: 396px;
+			background-image: url('/resources/images/pixel-white.png');
+			background-size: cover;
+		}
+	</style>
+
 </head>
 <body>
 	<div id="header">
 		<h1>The Gathering <TMPL_VAR NAME=TG_FULL> Streams</h1>
 	</div>
+	<div id="floater">
+
+	</div>
 	<div class="section">
 		<div class="container">
 			<div class="row">
 				<div class="twelve columns">
 					<TMPL_UNLESS NAME=NOHEADER>
-						<video id="stream" class="video-js vjs-default-skin" controls preload="auto" poster="/resources/images/loading.png" data-setup='{ "autoplay": <TMPL_VAR NAME=VIDEO_AUTO_PLAY>, "plugins" : { "resolutionSelector" : { "default_res" : "720", "force_typesz" : [ "video/flv" ] } } }'>
+						<video id="stream" class="videoframe video-js vjs-default-skin" controls preload="auto" poster="/resources/images/loading.png" data-setup='{ "autoplay": <TMPL_VAR NAME=VIDEO_AUTO_PLAY>, "plugins" : { "resolutionSelector" : { "default_res" : "720", "force_typesz" : [ "video/flv" ] } } }'>
 							<source src="<TMPL_VAR NAME=VIDEO_URL>" id="videodata" type="video/flv" data-res="720">
 							<p class="vjs-no-js">
 								To view this video please enable JavaScript, and consider upgrading to a web browser that <a href="http://videojs.com/html5-video-support/" target="_blank">supports HTML5 video</a>
diff --git a/web/stream.gathering.org/resources/css/core.css b/web/stream.gathering.org/resources/css/core.css
index cad5d3a..5a7a6f0 100644
--- a/web/stream.gathering.org/resources/css/core.css
+++ b/web/stream.gathering.org/resources/css/core.css
@@ -40,9 +40,10 @@ body {
   background-color: #ffffff;
   text-align: center;
   padding-top: 50px;
-  color: #000000;
-  background-image: url('http://git.hvornum.se/resources/images/tech-bg.jpg');
-  text-shadow: 2px 2px #c2c2c2;
+  color: #FFFFFF;
+  background-color: #000000;
+  /*background-image: url('http://git.hvornum.se/resources/images/tech-bg.jpg');*/
+  /*text-shadow: 2px 2px #c2c2c2;*/
   background-repeat: no-repeat;
   background-size: cover;
 }
@@ -51,6 +52,10 @@ body {
   padding-top: 150px;
 }
 
+.videoframe {
+  left: 50%;
+}
+
 .section {
   padding: 8rem 0 7rem;
   text-align: center;
@@ -72,7 +77,7 @@ body {
   }
 
 #stream {
-  width: 1280px;
+  width: 960px;
   min-width: 960px;
   height: 540px;
   min-height: 540px;
@@ -89,23 +94,84 @@ body {
 @media (min-width: 550px) {
   .section {
     padding: 12rem 0 11rem;
+    padding-bottom: 30px;
   }
   .content { text-align: left; }
+  #floater {
+    min-width: 300px;
+    min-height: 190px;
+    width: 300px;
+    height: 190px;
+  }
+  #stream {
+    min-width: 320px;
+    min-height: 183px;
+  }
+    .videoframe {
+      margin-left: -160px;
+    }
 }
 
-/* Bigger than 750 */
-@media (min-width: 750px) {
+/* Bigger than 920 */
+@media (min-width: 920px) {
   .section {
     padding: 5rem 0 5rem;
+    padding-bottom: 30px;
+  }
+  .content { text-align: left; }
+  #floater {
+    min-width: 300px;
+    min-height: 190px;
+    width: 300px;
+    height: 190px;
+  }
+  #stream {
+    min-width: 500px;
+    min-height: 280px;
+  }
+    .videoframe {
+      margin-left: -250px;
+    }
+}
+
+/* Bigger than 1200 */
+@media (min-width: 1200px) {
+  .section {
+    padding: 1rem 0 1rem;
+    padding-bottom: 30px;
   }
   .content { text-align: left; }
+  #floater {
+    min-width: 531px;
+    min-height: 396px;
+  }
+  #stream {
+    min-width: 700px;
+    min-height: 393px;
+  }
+    .videoframe {
+      margin-left: -350px;
+    }
 }
 
-/* Bigger than 1000 */
-@media (min-width: 1000px) {
+/* Bigger than 1600 */
+@media (min-width: 1600px) {
   .section {
     padding: 1rem 0 1rem;
     padding-bottom: 30px;
   }
   .content { text-align: left; }
+  #floater {
+    min-width: 531px;
+    min-height: 396px;
+  }
+  #stream {
+    width: 960px;
+    min-width: 960px;
+    height: 540px;
+    min-height: 540px;
+  }
+    .videoframe {
+      margin-left: -480px;
+    }
 }
 \ No newline at end of file
diff --git a/web/stream.gathering.org/resources/images/pixel-white.png b/web/stream.gathering.org/resources/images/pixel-white.png
new file mode 100644
index 0000000..259d96b
--- /dev/null
+++ b/web/stream.gathering.org/resources/images/pixel-white.png
diff --git a/web/stream.gathering.org/resources/images/pixel_animation.gif b/web/stream.gathering.org/resources/images/pixel_animation.gif
new file mode 100644
index 0000000..5840442
--- /dev/null
+++ b/web/stream.gathering.org/resources/images/pixel_animation.gif
diff --git a/web/streamlib/stream/config.pm b/web/streamlib/stream/config.pm
index 19a1e4d..918e555 100644
--- a/web/streamlib/stream/config.pm
+++ b/web/streamlib/stream/config.pm
@@ -6,9 +6,9 @@ use NetAddr::IP;
 our $v4net = NetAddr::IP->new("151.216.128.0/17");
 our $v6net = NetAddr::IP->new("2a02:ed02::/32");
 our $multicast = "udp://\@233.191.12.1";
-our $vlc_base_host = "http://cubemap.tg14.gathering.org";
-our $tg = 14;
-our $tg_full = 2014;
+our $video_url = "http://wat.gathering.org:9094/southcam.flv";
+our $tg = 15;
+our $tg_full = 2015;
 
 
 # priority = sorting order in streaming list
@@ -24,6 +24,7 @@ our %streams =  (
 			'priority' => 20,
 			'port' => 80,
 			'url' => '/event.ts',
+			'online' => 0,
 			'interlaced' => 0,
 			'has_multicast' => 0,
 			'multicast_ip' => 'udp://@[ff7e:a40:2a02:ed02:ffff::15]:2015',
@@ -47,6 +48,7 @@ our %streams =  (
 			'quality' => 'sd',
 			'priority' => 24,
 			'port' => 80,
+			'online' => 0,
 			'url' => '/event-sd.ts',
 			'interlaced' => 0,
 			'has_multicast' => 0,
@@ -59,6 +61,7 @@ our %streams =  (
 			'quality' => 'sd',
 			'priority' => 25,
 			'port' => 80,
+			'online' => 0,
 			'url' => '/event-superlow.ts',
 			'interlaced' => 0,
 			'has_multicast' => 0,
@@ -83,10 +86,12 @@ our %streams =  (
 			'type' => 'camera',
 			'quality' => 'hd',
 			'priority' => 40,
-			'url' => "/southcam.ts",
-                        'port' => 80,
+			'url' => "http://wat.gathering.org:9094/southcam.flv", # <-- In use (Need to rebuild row 67 in index.pl)
+            'port' => 80,
 			'interlaced' => 0,
 			'has_multicast' => 0,
+			'external' => 1, # <-- In use (Need to rebuild row 67 in index.pl)
+			'online' => 1,
 #			'multicast_ip' => "udp://@[ff7e:a40:2a02:ed02:ffff::16]",
 			'source' => 'Tech',
 			'title' => 'Webcam South (HD) (1920x1080 H.264) 10mbps',
@@ -99,6 +104,7 @@ our %streams =  (
 			'url' => "/roofcam.ts",
 			'port' => 80,
 			'interlaced' => 1,
+			'online' => 0,
 			'has_multicast' => 0,
 			#'multicast_ip' => "udp://\@[ff7e:a40:2a02:ed02:ffff::15]",
 			'source' => 'Tech',
@@ -109,16 +115,18 @@ our %streams =  (
 			'type' => 'camera',
 			'quality' => 'hd',
 			'priority' => 130,
-                        'url' => '/noccam.ts',
-			'port' => 80,
-			'has_multicast' => 0,
-			'interlaced' => 0,
-			'multicast_ip' => "udp://@[ff7e:a40:2a02:ed02:ffff::18]:2018",
-			'source' => "Tech",
+            'url' => 'http://wat.gathering.org:9094/noccam.flv',
+			'port' => 80, # <-- Safe to remove
+			'external' => 1,
+			'has_multicast' => 0, # <-- Safe to remove
+			'interlaced' => 0, # <-- Safe to remove
+			'online' => 1,
+			'multicast_ip' => "udp://@[ff7e:a40:2a02:ed02:ffff::18]:2018",# <-- Safe to remove
+			'source' => "Tech", # <-- Safe to remove
 			'title' => "Webcam NOC (HD) (1280x720 H.264) 5mbps"
 		},
 
-			);
+);
 
 
 1;
author	root <root@einstein.tg15.gathering.org>	2015-03-31 04:39:50 +0200
committer	root <root@einstein.tg15.gathering.org>	2015-03-31 04:39:50 +0200
commit	e3d7c5cc86fedb458d9b091ca12245c01e7f285d (patch)
tree	e6e2dd92505d972e8a0d4e28160eb4657416dfcd /web
parent	aff65378ea1ae556dbccc9a2f97a97811c86c39d (diff)