[Debconf-video-commits] r113 - package/trunk/conf
edrz-guest at alioth.debian.org
edrz-guest at alioth.debian.org
Tue Jul 29 22:05:29 UTC 2008
Author: edrz-guest
Date: 2008-07-29 22:05:26 +0000 (Tue, 29 Jul 2008)
New Revision: 113
Added:
package/trunk/conf/ezstream-dc-ext-replay.xml
package/trunk/conf/ezstream-dc-int-replay.xml
package/trunk/conf/playlist_gen.sh
Modified:
package/trunk/conf/DC8_STREAMING_PLAN
package/trunk/conf/icecast-dc-int-master.xml
Log:
adding ezstream files for replay mountpoint that will serve as fallback for live streams.
Modified: package/trunk/conf/DC8_STREAMING_PLAN
===================================================================
--- package/trunk/conf/DC8_STREAMING_PLAN 2008-07-28 22:46:25 UTC (rev 112)
+++ package/trunk/conf/DC8_STREAMING_PLAN 2008-07-29 22:05:26 UTC (rev 113)
@@ -1,16 +1,12 @@
-NOTES: burst-on-connect is deprecated in favor of burst-size
- raise loglevel to 4
- turn off logrotate
- increase logsize
- set logarchive
+ezstream-dc-ext-replay.xml (apu)
+ezstream-dc-int-replay.xml (daffy)
+playlist_gen.sh (should run via cron while new files are being generated)
-
-
-daffy (encoder) (vende in edrz test settup)
+daffy (encoder)
ezstream local playlist to lisa for dc8-int fallback mount
dvsink-command x 2
-lisa (dc8-int-master) (orinen in edrz test settup)
+lisa (dc-int-master) (orinen in edrz test settup) done, tested,
listens on 3 interfaces
v-t (sources): ezstream, dvsink-command salon_del_mar, dvsink-command microcine
int: serves int network
@@ -22,11 +18,11 @@
microcine: (relayed by krusty)
-krusty (dc8-ext-master) (ice in edrz test settup)
+krusty (dc-ext-master) (iobo in edrz test settup)
relays microcine & salon_del_mar via <master_relay> from lisa
relays fallback from apu
-apu (iobo-64 in edrz test settup)
+apu (vende in edrz test settup)
ezstream feeds fallback mount
fallback mount relayed by krusty
relays krusty's microcine & salone_del_mar
@@ -34,3 +30,17 @@
other, non-apu relays (shadow-64 in edrz test settup)
relay all krusty mountpoints via <master_relay>
+
+
+
+NOTES: burst-on-connect is deprecated in favor of burst-size
+ raise loglevel to 4
+ turn off logrotate's rotation (but keep compression?)
+ increase logsize
+ set logarchive
+
+ almost no clients handle chained ogg streams properly so viewers will
+ have to reconnect when the live streams fallback or when the fallback is
+ overridden. This is still better than viewers connecting to an
+ advertised mount and getting nothing, imho. (also a chance to raise
+ awareness about this nearly universal client bug)
Added: package/trunk/conf/ezstream-dc-ext-replay.xml
===================================================================
--- package/trunk/conf/ezstream-dc-ext-replay.xml (rev 0)
+++ package/trunk/conf/ezstream-dc-ext-replay.xml 2008-07-29 22:05:26 UTC (rev 113)
@@ -0,0 +1,12 @@
+<ezstream>
+ <url>http://abe.debconf.org:8000/replay.ogv</url>
+ <sourcepassword>#PASSWORD#</sourcepassword>
+ <format>THEORA</format>
+ <filename>#PLAYLIST_PATH#</filename>
+ <!-- For demonstrational purposes, explicitly set continuous streaming: -->
+ <stream_once>0</stream_once>
+ <shuffle>1</shuffle>
+ <svrinfoname>dc-fallback</svrinfoname>
+ <svrinfogenre>Talk</svrinfogenre>
+ <svrinfodescription>DebConf_Talk_Replay</svrinfodescription>
+</ezstream>
Added: package/trunk/conf/ezstream-dc-int-replay.xml
===================================================================
--- package/trunk/conf/ezstream-dc-int-replay.xml (rev 0)
+++ package/trunk/conf/ezstream-dc-int-replay.xml 2008-07-29 22:05:26 UTC (rev 113)
@@ -0,0 +1,12 @@
+<ezstream>
+ <url>http://int-master.video.debconf.org:8000/replay.ogv</url>
+ <sourcepassword>#PASSWORD#</sourcepassword>
+ <format>THEORA</format>
+ <filename>#PLAYLIST_PATH#</filename>
+ <!-- For demonstrational purposes, explicitly set continuous streaming: -->
+ <stream_once>0</stream_once>
+ <shuffle>1</shuffle>
+ <svrinfoname>dc-fallback</svrinfoname>
+ <svrinfogenre>Talk</svrinfogenre>
+ <svrinfodescription>DebConf_Talk_Replay</svrinfodescription>
+</ezstream>
Modified: package/trunk/conf/icecast-dc-int-master.xml
===================================================================
--- package/trunk/conf/icecast-dc-int-master.xml 2008-07-28 22:46:25 UTC (rev 112)
+++ package/trunk/conf/icecast-dc-int-master.xml 2008-07-29 22:05:26 UTC (rev 113)
@@ -1,10 +1,10 @@
<icecast>
<limits>
- <clients>200</clients>
+ <clients>300</clients>
<sources>10</sources>
<threadpool>10</threadpool>
- <queue-size>524288</queue-size>
- <client-timeout>30</client-timeout>
+ <queue-size>2097152</queue-size>
+ <client-timeout>60</client-timeout>
<header-timeout>15</header-timeout>
<source-timeout>60</source-timeout>
<!-- If enabled, this will provide a burst of data when a client
@@ -13,18 +13,18 @@
it also significantly increases latency between the source
client and listening client. For low-latency setups, you
might want to disable this. -->
- <burst-on-connect>1</burst-on-connect>
+ <burst-size>131072</burst-size>
</limits>
<authentication>
<!-- Sources log in with username 'source' -->
- <source-password><PASSWORD></source-password>
+ <source-password>#PASSWORD#</source-password>
<!-- Relays log in username 'relay' -->
- <relay-password><PASSWORD></relay-password>
+ <relay-password>#PASSWORD#</relay-password>
<!-- Admin logs in with the username given below -->
<admin-user>admin</admin-user>
- <admin-password><PASSWORD></admin-password>
+ <admin-password>#PASSWORD#</admin-password>
</authentication>
<!-- This is the hostname other people will use to connect to your server.
@@ -32,7 +32,7 @@
listings. -->
<!-- Inside the conference, video.debconf.org should resolve to this
server (known externally as int-master.video.debconf.org). -->
- <hostname>video.debconf.org</hostname>
+ <hostname>int-master.video.debconf.org</hostname>
<listen-socket>
<port>8000</port>
@@ -40,15 +40,23 @@
<fileserve>0</fileserve>
- <!-- Add this for each room's stream, otherwise Icecast will not
- tell relays about it (as of version 2.3). -->
- <!--
<mount>
- <mount-name>...</mount-name>
- <public>1</public>
+ <mount-name>/salon_del_mar.ogv</mount-name>
+ <fallback-mount>/replay.ogv</fallback-mount>
+ <fallback-override>1</fallback-override>
</mount>
- -->
+ <mount>
+ <mount-name>/microcine.ogv</mount-name>
+ <fallback-mount>/replay.ogv</fallback-mount>
+ <fallback-override>1</fallback-override>
+ </mount>
+
+ <mount>
+ <mount-name>/replay.ogv</mount-name>
+ <hidden>1</hidden>
+ </mount>
+
<paths>
<!-- basedir is only used if chroot is enabled -->
<basedir>/usr/share/icecast2</basedir>
@@ -69,8 +77,9 @@
<logging>
<accesslog>access.log</accesslog>
<errorlog>error.log</errorlog>
- <loglevel>3</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error -->
- <logsize>10000</logsize> <!-- Max size of a logfile -->
+ <loglevel>4</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error -->
+ <logsize>100000</logsize> <!-- Max size of a logfile -->
+ <logarchive>1</logarchive>
</logging>
<security>
Added: package/trunk/conf/playlist_gen.sh
===================================================================
--- package/trunk/conf/playlist_gen.sh (rev 0)
+++ package/trunk/conf/playlist_gen.sh 2008-07-29 22:05:26 UTC (rev 113)
@@ -0,0 +1,15 @@
+#!/bin/bash
+# silly little script to re-generate playlist for ezstream
+# probably should be smarter
+
+playlist="#PLAYLIST_PATH"
+oggv_dir="#OGV_DIR_PATH"
+
+rm -f ${playlist}
+
+for i in ${ogv_dir}
+ do echo "${i}" >> ${playlist}
+done
+
+killall -HUP ezstream
+
Property changes on: package/trunk/conf/playlist_gen.sh
___________________________________________________________________
Name: svn:executable
+ *
More information about the Debconf-video-commits
mailing list