[Debconf-video-commits] r523 - in package/trunk: conf/streaming/debconf doc

[Eric Dantan Rzewnicki]

Author: edrz-guest
Date: 2010-07-01 18:17:19 +0000 (Thu, 01 Jul 2010)
New Revision: 523

Modified:
   package/trunk/conf/streaming/debconf/icecast-dc-ext-master.xml
   package/trunk/conf/streaming/debconf/icecast-dc-int-master.xml
   package/trunk/conf/streaming/debconf/icecast-dc-relay.xml
   package/trunk/doc/streaming-plan.txt
Log:
Update for DC10 stream mountpoints and hosts.



Modified: package/trunk/conf/streaming/debconf/icecast-dc-ext-master.xml
===================================================================
--- package/trunk/conf/streaming/debconf/icecast-dc-ext-master.xml	2010-07-01 17:02:20 UTC (rev 522)
+++ package/trunk/conf/streaming/debconf/icecast-dc-ext-master.xml	2010-07-01 18:17:19 UTC (rev 523)
@@ -41,7 +41,7 @@
     <relay>
         <server>int-master.video.debconf.org</server>
         <port>8000</port>
-        <mount>/Salon_del_mar.ogv</mount>
+        <mount>/Davis_Auditorium.ogv</mount>
         <username>relay</username>
         <password>#PASSWORD#</password>
         <on-demand>1</on-demand>
@@ -50,18 +50,18 @@
     <relay>
         <server>int-master.video.debconf.org</server>
         <port>8000</port>
-        <mount>/Microcine.ogv</mount>
+        <mount>/Interschool_Lab.ogv</mount>
         <username>relay</username>
         <password>#PASSWORD#</password>
         <on-demand>1</on-demand>
     </relay>
 
     <mount>
-        <mount-name>/Salon_del_mar.ogv</mount-name>
+        <mount-name>/Davis_Auditorium.ogv</mount-name>
     </mount>
 
     <mount>
-        <mount-name>/Microcine.ogv</mount-name>
+        <mount-name>/Interschool_Lab.ogv</mount-name>
     </mount>
 
     <mount>

Modified: package/trunk/conf/streaming/debconf/icecast-dc-int-master.xml
===================================================================
--- package/trunk/conf/streaming/debconf/icecast-dc-int-master.xml	2010-07-01 17:02:20 UTC (rev 522)
+++ package/trunk/conf/streaming/debconf/icecast-dc-int-master.xml	2010-07-01 18:17:19 UTC (rev 523)
@@ -41,13 +41,13 @@
     <fileserve>0</fileserve>
 
     <mount>
-        <mount-name>/Salon_del_mar.ogv</mount-name>
+        <mount-name>/Davis_Auditorium.ogv</mount-name>
 	<fallback-mount>/replay-int.ogv</fallback-mount>
 	<fallback-override>1</fallback-override>
     </mount>
 
     <mount>
-        <mount-name>/Microcine.ogv</mount-name>
+        <mount-name>/Interschool_Lab.ogv</mount-name>
 	<fallback-mount>/replay-int.ogv</fallback-mount>
 	<fallback-override>1</fallback-override>
     </mount>

Modified: package/trunk/conf/streaming/debconf/icecast-dc-relay.xml
===================================================================
--- package/trunk/conf/streaming/debconf/icecast-dc-relay.xml	2010-07-01 17:02:20 UTC (rev 522)
+++ package/trunk/conf/streaming/debconf/icecast-dc-relay.xml	2010-07-01 18:17:19 UTC (rev 523)
@@ -46,7 +46,7 @@
     <relay>
         <server>ext-master.video.debconf.org</server>
         <port>8000</port>
-        <mount>/Salon_del_mar.ogv</mount>
+        <mount>/Davis_Auditorium.ogv</mount>
         <username>relay</username>
         <password>#PASSWORD#</password>
         <on-demand>1</on-demand>
@@ -55,7 +55,7 @@
     <relay>
         <server>ext-master.video.debconf.org</server>
         <port>8000</port>
-        <mount>/Microcine.ogv</mount>
+        <mount>/Interschool_Lab.ogv</mount>
         <username>relay</username>
         <password>#PASSWORD#</password>
         <on-demand>1</on-demand>
@@ -72,13 +72,13 @@
 
 
     <mount>
-        <mount-name>/Salon_del_mar.ogv</mount-name>
+        <mount-name>/Davis_Auditorium.ogv</mount-name>
         <fallback-mount>/replay-ext.ogv</fallback-mount>
         <fallback-override>1</fallback-override>
     </mount>
 
     <mount>
-        <mount-name>/Microcine.ogv</mount-name>
+        <mount-name>/Interschool_Lab.ogv</mount-name>
         <fallback-mount>/replay-ext.ogv</fallback-mount>
         <fallback-override>1</fallback-override>
     </mount>

Modified: package/trunk/doc/streaming-plan.txt
===================================================================
--- package/trunk/doc/streaming-plan.txt	2010-07-01 17:02:20 UTC (rev 522)
+++ package/trunk/doc/streaming-plan.txt	2010-07-01 18:17:19 UTC (rev 523)
@@ -11,21 +11,21 @@
 
 lisa (dc-int-master)
   mountpoints:
-    fallback: (hidden, hence not relayed by krabappel)
-    salon_del_mar: (relayed by krabappel)
-    microcine: (relayed by krabappel)
+    fallback: (hidden, hence not relayed by krusty)
+    davis_auditorium: (relayed by krusty)
+    interschool_lab: (relayed by krusty)
 
-krabappel.debconf.org (dc-ext-master)
-    relays upper_talkroom & lower_talkroom via <master_relay> from lisa
+krusty.debconf.org (dc-ext-master)
+    relays davis_auditorium & interschool_lab via <master_relay> from lisa
     relays fallback from apu
 
 apu
   ezstream feeds fallback mount
   fallback mount relayed by krusty
-  relays krabappel's upper_talkroom & lower_talkroom
+  relays krusty's davis_auditorium & interschool_lab
 
 other, non-apu relays
-  relay all krabappel mountpoints via <master_relay>
+  relay all krusty mountpoints via <master_relay>