[Debconf-video-commits] r291 - in package/trunk/conf: . streaming streaming/dc8 streaming/fosdem09
edrz-guest at alioth.debian.org
edrz-guest at alioth.debian.org
Thu Feb 5 20:16:18 UTC 2009
Author: edrz-guest
Date: 2009-02-05 20:16:18 +0000 (Thu, 05 Feb 2009)
New Revision: 291
Added:
package/trunk/conf/streaming/
package/trunk/conf/streaming/dc8/
package/trunk/conf/streaming/dc8/ezstream-dc-ext-replay.xml
package/trunk/conf/streaming/dc8/ezstream-dc-int-replay.xml
package/trunk/conf/streaming/dc8/icecast-dc-ext-master.xml
package/trunk/conf/streaming/dc8/icecast-dc-int-master.xml
package/trunk/conf/streaming/dc8/icecast-dc-relay.xml
package/trunk/conf/streaming/fosdem09/
package/trunk/conf/streaming/fosdem09/ezstream-fosdem-replay.xml
package/trunk/conf/streaming/fosdem09/icecast-fosdem-master.xml
package/trunk/conf/streaming/fosdem09/icecast-fosdem-relay.xml
Removed:
package/trunk/conf/ezstream-dc-ext-replay.xml
package/trunk/conf/ezstream-dc-int-replay.xml
package/trunk/conf/icecast-dc-ext-master.xml
package/trunk/conf/icecast-dc-int-master.xml
package/trunk/conf/icecast-dc-relay.xml
package/trunk/conf/playlist_gen.sh
Log:
Reorganize streaming configs to keep events seperate and first stab at FOSDEM09
configs.
Deleted: package/trunk/conf/ezstream-dc-ext-replay.xml
===================================================================
--- package/trunk/conf/ezstream-dc-ext-replay.xml 2009-02-05 20:05:15 UTC (rev 290)
+++ package/trunk/conf/ezstream-dc-ext-replay.xml 2009-02-05 20:16:18 UTC (rev 291)
@@ -1,12 +0,0 @@
-<ezstream>
- <url>http://ext-master.video.debconf.org:8000/replay-ext.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>
Deleted: package/trunk/conf/ezstream-dc-int-replay.xml
===================================================================
--- package/trunk/conf/ezstream-dc-int-replay.xml 2009-02-05 20:05:15 UTC (rev 290)
+++ package/trunk/conf/ezstream-dc-int-replay.xml 2009-02-05 20:16:18 UTC (rev 291)
@@ -1,12 +0,0 @@
-<ezstream>
- <url>http://int-master.video.debconf.org:8000/replay-int.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>
Deleted: package/trunk/conf/icecast-dc-ext-master.xml
===================================================================
--- package/trunk/conf/icecast-dc-ext-master.xml 2009-02-05 20:05:15 UTC (rev 290)
+++ package/trunk/conf/icecast-dc-ext-master.xml 2009-02-05 20:16:18 UTC (rev 291)
@@ -1,99 +0,0 @@
-<icecast>
- <limits>
- <clients>300</clients>
- <sources>10</sources>
- <threadpool>10</threadpool>
- <queue-size>524288</queue-size>
- <client-timeout>30</client-timeout>
- <header-timeout>15</header-timeout>
- <source-timeout>10</source-timeout>
- <!-- If enabled, this will provide a burst of data when a client
- first connects, thereby significantly reducing the startup
- time for listeners that do substantial buffering. However,
- it also significantly increases latency between the source
- client and listening client. For low-latency setups, you
- might want to disable this. -->
- <burst-size>65536</burst-size>
- </limits>
-
- <authentication>
- <!-- Sources log in with username 'source' -->
- <source-password>#PASSWORD#</source-password>
- <!-- Relays log in username 'relay' -->
- <relay-password>#PASSWORD#</relay-password>
-
- <!-- Admin logs in with the username given below -->
- <admin-user>admin</admin-user>
- <admin-password>#PASSWORD#</admin-password>
- </authentication>
-
- <!-- This is the hostname other people will use to connect to your server.
- It affects mainly the urls generated by Icecast for playlists and yp
- listings. -->
- <hostname>ext-master.video.debconf.org</hostname>
-
- <listen-socket>
- <port>8000</port>
- </listen-socket>
-
- <fileserve>0</fileserve>
-
- <relay>
- <server>int-master.video.debconf.org</server>
- <port>8000</port>
- <mount>/Salon_del_mar.ogv</mount>
- <username>relay</username>
- <password>#PASSWORD#</password>
- <on-demand>1</on-demand>
- </relay>
-
- <relay>
- <server>int-master.video.debconf.org</server>
- <port>8000</port>
- <mount>/Microcine.ogv</mount>
- <username>relay</username>
- <password>#PASSWORD#</password>
- <on-demand>1</on-demand>
- </relay>
-
- <mount>
- <mount-name>/Salon_del_mar.ogv</mount-name>
- </mount>
-
- <mount>
- <mount-name>/Microcine.ogv</mount-name>
- </mount>
-
- <mount>
- <mount-name>/Replay-ext.ogv</mount-name>
- </mount>
-
- <paths>
- <!-- basedir is only used if chroot is enabled -->
- <basedir>/usr/share/icecast2</basedir>
-
- <!-- Note that if <chroot> is turned on below, these paths must both
- be relative to the new root, not the original root -->
- <logdir>/var/log/icecast2</logdir>
- <webroot>/usr/share/icecast2/web</webroot>
- <adminroot>/usr/share/icecast2/admin</adminroot>
-
- <!-- Aliases: can also be used for simple redirections as well,
- this example will redirect all requests for http://server:port/ to
- the status page
- -->
- <alias source="/" dest="/status.xsl"/>
- </paths>
-
- <logging>
- <accesslog>access.log</accesslog>
- <errorlog>error.log</errorlog>
- <loglevel>4</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error -->
- <logsize>100000</logsize> <!-- Max size of a logfile -->
- <logarchive>1</logarchive>
- </logging>
-
- <security>
- <chroot>0</chroot>
- </security>
-</icecast>
Deleted: package/trunk/conf/icecast-dc-int-master.xml
===================================================================
--- package/trunk/conf/icecast-dc-int-master.xml 2009-02-05 20:05:15 UTC (rev 290)
+++ package/trunk/conf/icecast-dc-int-master.xml 2009-02-05 20:16:18 UTC (rev 291)
@@ -1,88 +0,0 @@
-<icecast>
- <limits>
- <clients>300</clients>
- <sources>10</sources>
- <threadpool>10</threadpool>
- <queue-size>2097152</queue-size>
- <client-timeout>30</client-timeout>
- <header-timeout>15</header-timeout>
- <source-timeout>10</source-timeout>
- <!-- If enabled, this will provide a burst of data when a client
- first connects, thereby significantly reducing the startup
- time for listeners that do substantial buffering. However,
- it also significantly increases latency between the source
- client and listening client. For low-latency setups, you
- might want to disable this. -->
- <burst-size>131072</burst-size>
- </limits>
-
- <authentication>
- <!-- Sources log in with username 'source' -->
- <source-password>#PASSWORD#</source-password>
- <!-- Relays log in username 'relay' -->
- <relay-password>#PASSWORD#</relay-password>
-
- <!-- Admin logs in with the username given below -->
- <admin-user>admin</admin-user>
- <admin-password>#PASSWORD#</admin-password>
- </authentication>
-
- <!-- This is the hostname other people will use to connect to your server.
- It affects mainly the urls generated by Icecast for playlists and yp
- listings. -->
- <!-- Inside the conference, video.debconf.org should resolve to this
- server (known externally as int-master.video.debconf.org). -->
- <hostname>int-master.video.debconf.org</hostname>
-
- <listen-socket>
- <port>8000</port>
- </listen-socket>
-
- <fileserve>0</fileserve>
-
- <mount>
- <mount-name>/Salon_del_mar.ogv</mount-name>
- <fallback-mount>/replay-int.ogv</fallback-mount>
- <fallback-override>1</fallback-override>
- </mount>
-
- <mount>
- <mount-name>/Microcine.ogv</mount-name>
- <fallback-mount>/replay-int.ogv</fallback-mount>
- <fallback-override>1</fallback-override>
- </mount>
-
- <mount>
- <mount-name>/replay-int.ogv</mount-name>
- <hidden>1</hidden>
- </mount>
-
- <paths>
- <!-- basedir is only used if chroot is enabled -->
- <basedir>/usr/share/icecast2</basedir>
-
- <!-- Note that if <chroot> is turned on below, these paths must both
- be relative to the new root, not the original root -->
- <logdir>/var/log/icecast2</logdir>
- <webroot>/usr/share/icecast2/web</webroot>
- <adminroot>/usr/share/icecast2/admin</adminroot>
-
- <!-- Aliases: can also be used for simple redirections as well,
- this example will redirect all requests for http://server:port/ to
- the status page
- -->
- <alias source="/" dest="/status.xsl"/>
- </paths>
-
- <logging>
- <accesslog>access.log</accesslog>
- <errorlog>error.log</errorlog>
- <loglevel>4</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error -->
- <logsize>100000</logsize> <!-- Max size of a logfile -->
- <logarchive>1</logarchive>
- </logging>
-
- <security>
- <chroot>0</chroot>
- </security>
-</icecast>
Deleted: package/trunk/conf/icecast-dc-relay.xml
===================================================================
--- package/trunk/conf/icecast-dc-relay.xml 2009-02-05 20:05:15 UTC (rev 290)
+++ package/trunk/conf/icecast-dc-relay.xml 2009-02-05 20:16:18 UTC (rev 291)
@@ -1,119 +0,0 @@
-<icecast>
- <limits>
- <!-- Clients will use up to about 300 kbit/s each. Adjust
- this limit to suit your bandwidth allocation. -->
- <clients>300</clients>
- <!-- Maximum number of relayed sources. -->
- <sources>10</sources>
- <threadpool>10</threadpool>
- <queue-size>524288</queue-size>
- <client-timeout>30</client-timeout>
- <header-timeout>15</header-timeout>
- <source-timeout>10</source-timeout>
- <!-- If enabled, this will provide a burst of data when a client
- first connects, thereby significantly reducing the startup
- time for listeners that do substantial buffering. However,
- it also significantly increases latency between the source
- client and listening client. For low-latency setups, you
- might want to disable this. -->
- <burst-size>65536</burst-size>
- </limits>
-
- <authentication>
- <!-- Sources log in with username 'source' -->
- <source-password>#PASSWORD#</source-password>
- <!-- Relays log in username 'relay' -->
- <relay-password>#PASSWORD#</relay-password>
-
- <!-- Admin logs in with the username given below -->
- <admin-user>admin</admin-user>
- <admin-password>#PASSWORD#</admin-password>
- </authentication>
-
- <!-- This is the hostname other people will use to connect to your server.
- It affects mainly the urls generated by Icecast for playlists and yp
- listings. -->
- <!-- Outside the conference, video.debconf.org should resolve to
- many relay servers. -->
- <hostname>video.debconf.org</hostname>
-
- <listen-socket>
- <port>8000</port>
- </listen-socket>
-
- <fileserve>0</fileserve>
-
- <relay>
- <server>ext-master.video.debconf.org</server>
- <port>8000</port>
- <mount>/Salon_del_mar.ogv</mount>
- <username>relay</username>
- <password>#PASSWORD#</password>
- <on-demand>1</on-demand>
- </relay>
-
- <relay>
- <server>ext-master.video.debconf.org</server>
- <port>8000</port>
- <mount>/Microcine.ogv</mount>
- <username>relay</username>
- <password>#PASSWORD#</password>
- <on-demand>1</on-demand>
- </relay>
-
- <relay>
- <server>ext-master.video.debconf.org</server>
- <port>8000</port>
- <mount>/replay-ext.ogv</mount>
- <username>relay</username>
- <password>#PASSWORD#</password>
- <on-demand>1</on-demand>
- </relay>
-
-
- <mount>
- <mount-name>/Salon_del_mar.ogv</mount-name>
- <fallback-mount>/replay-ext.ogv</fallback-mount>
- <fallback-override>1</fallback-override>
- </mount>
-
- <mount>
- <mount-name>/Microcine.ogv</mount-name>
- <fallback-mount>/replay-ext.ogv</fallback-mount>
- <fallback-override>1</fallback-override>
- </mount>
-
- <mount>
- <mount-name>/replay-ext.ogv</mount-name>
- <hidden>0</hidden>
- </mount>
-
- <paths>
- <!-- basedir is only used if chroot is enabled -->
- <basedir>/usr/share/icecast2</basedir>
-
- <!-- Note that if <chroot> is turned on below, these paths must both
- be relative to the new root, not the original root -->
- <logdir>/var/log/icecast2</logdir>
- <webroot>/usr/share/icecast2/web</webroot>
- <adminroot>/usr/share/icecast2/admin</adminroot>
-
- <!-- Aliases: can also be used for simple redirections as well,
- this example will redirect all requests for http://server:port/ to
- the status page
- -->
- <alias source="/" dest="/status.xsl"/>
- </paths>
-
- <logging>
- <accesslog>access.log</accesslog>
- <errorlog>error.log</errorlog>
- <loglevel>4</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error -->
- <logsize>100000</logsize> <!-- Max size of a logfile -->
- <logarchive>1</logarchive>
- </logging>
-
- <security>
- <chroot>0</chroot>
- </security>
-</icecast>
Deleted: package/trunk/conf/playlist_gen.sh
===================================================================
--- package/trunk/conf/playlist_gen.sh 2009-02-05 20:05:15 UTC (rev 290)
+++ package/trunk/conf/playlist_gen.sh 2009-02-05 20:16:18 UTC (rev 291)
@@ -1,15 +0,0 @@
-#!/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
-
Copied: package/trunk/conf/streaming/dc8/ezstream-dc-ext-replay.xml (from rev 288, package/trunk/conf/ezstream-dc-ext-replay.xml)
===================================================================
--- package/trunk/conf/streaming/dc8/ezstream-dc-ext-replay.xml (rev 0)
+++ package/trunk/conf/streaming/dc8/ezstream-dc-ext-replay.xml 2009-02-05 20:16:18 UTC (rev 291)
@@ -0,0 +1,12 @@
+<ezstream>
+ <url>http://ext-master.video.debconf.org:8000/replay-ext.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>
Property changes on: package/trunk/conf/streaming/dc8/ezstream-dc-ext-replay.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: package/trunk/conf/streaming/dc8/ezstream-dc-int-replay.xml (from rev 288, package/trunk/conf/ezstream-dc-int-replay.xml)
===================================================================
--- package/trunk/conf/streaming/dc8/ezstream-dc-int-replay.xml (rev 0)
+++ package/trunk/conf/streaming/dc8/ezstream-dc-int-replay.xml 2009-02-05 20:16:18 UTC (rev 291)
@@ -0,0 +1,12 @@
+<ezstream>
+ <url>http://int-master.video.debconf.org:8000/replay-int.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>
Property changes on: package/trunk/conf/streaming/dc8/ezstream-dc-int-replay.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: package/trunk/conf/streaming/dc8/icecast-dc-ext-master.xml (from rev 288, package/trunk/conf/icecast-dc-ext-master.xml)
===================================================================
--- package/trunk/conf/streaming/dc8/icecast-dc-ext-master.xml (rev 0)
+++ package/trunk/conf/streaming/dc8/icecast-dc-ext-master.xml 2009-02-05 20:16:18 UTC (rev 291)
@@ -0,0 +1,99 @@
+<icecast>
+ <limits>
+ <clients>300</clients>
+ <sources>10</sources>
+ <threadpool>10</threadpool>
+ <queue-size>524288</queue-size>
+ <client-timeout>30</client-timeout>
+ <header-timeout>15</header-timeout>
+ <source-timeout>10</source-timeout>
+ <!-- If enabled, this will provide a burst of data when a client
+ first connects, thereby significantly reducing the startup
+ time for listeners that do substantial buffering. However,
+ it also significantly increases latency between the source
+ client and listening client. For low-latency setups, you
+ might want to disable this. -->
+ <burst-size>65536</burst-size>
+ </limits>
+
+ <authentication>
+ <!-- Sources log in with username 'source' -->
+ <source-password>#PASSWORD#</source-password>
+ <!-- Relays log in username 'relay' -->
+ <relay-password>#PASSWORD#</relay-password>
+
+ <!-- Admin logs in with the username given below -->
+ <admin-user>admin</admin-user>
+ <admin-password>#PASSWORD#</admin-password>
+ </authentication>
+
+ <!-- This is the hostname other people will use to connect to your server.
+ It affects mainly the urls generated by Icecast for playlists and yp
+ listings. -->
+ <hostname>ext-master.video.debconf.org</hostname>
+
+ <listen-socket>
+ <port>8000</port>
+ </listen-socket>
+
+ <fileserve>0</fileserve>
+
+ <relay>
+ <server>int-master.video.debconf.org</server>
+ <port>8000</port>
+ <mount>/Salon_del_mar.ogv</mount>
+ <username>relay</username>
+ <password>#PASSWORD#</password>
+ <on-demand>1</on-demand>
+ </relay>
+
+ <relay>
+ <server>int-master.video.debconf.org</server>
+ <port>8000</port>
+ <mount>/Microcine.ogv</mount>
+ <username>relay</username>
+ <password>#PASSWORD#</password>
+ <on-demand>1</on-demand>
+ </relay>
+
+ <mount>
+ <mount-name>/Salon_del_mar.ogv</mount-name>
+ </mount>
+
+ <mount>
+ <mount-name>/Microcine.ogv</mount-name>
+ </mount>
+
+ <mount>
+ <mount-name>/Replay-ext.ogv</mount-name>
+ </mount>
+
+ <paths>
+ <!-- basedir is only used if chroot is enabled -->
+ <basedir>/usr/share/icecast2</basedir>
+
+ <!-- Note that if <chroot> is turned on below, these paths must both
+ be relative to the new root, not the original root -->
+ <logdir>/var/log/icecast2</logdir>
+ <webroot>/usr/share/icecast2/web</webroot>
+ <adminroot>/usr/share/icecast2/admin</adminroot>
+
+ <!-- Aliases: can also be used for simple redirections as well,
+ this example will redirect all requests for http://server:port/ to
+ the status page
+ -->
+ <alias source="/" dest="/status.xsl"/>
+ </paths>
+
+ <logging>
+ <accesslog>access.log</accesslog>
+ <errorlog>error.log</errorlog>
+ <loglevel>4</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error -->
+ <logsize>100000</logsize> <!-- Max size of a logfile -->
+ <logarchive>1</logarchive>
+ </logging>
+
+ <security>
+ <chroot>0</chroot>
+ </security>
+</icecast>
Property changes on: package/trunk/conf/streaming/dc8/icecast-dc-ext-master.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: package/trunk/conf/streaming/dc8/icecast-dc-int-master.xml (from rev 288, package/trunk/conf/icecast-dc-int-master.xml)
===================================================================
--- package/trunk/conf/streaming/dc8/icecast-dc-int-master.xml (rev 0)
+++ package/trunk/conf/streaming/dc8/icecast-dc-int-master.xml 2009-02-05 20:16:18 UTC (rev 291)
@@ -0,0 +1,88 @@
+<icecast>
+ <limits>
+ <clients>300</clients>
+ <sources>10</sources>
+ <threadpool>10</threadpool>
+ <queue-size>2097152</queue-size>
+ <client-timeout>30</client-timeout>
+ <header-timeout>15</header-timeout>
+ <source-timeout>10</source-timeout>
+ <!-- If enabled, this will provide a burst of data when a client
+ first connects, thereby significantly reducing the startup
+ time for listeners that do substantial buffering. However,
+ it also significantly increases latency between the source
+ client and listening client. For low-latency setups, you
+ might want to disable this. -->
+ <burst-size>131072</burst-size>
+ </limits>
+
+ <authentication>
+ <!-- Sources log in with username 'source' -->
+ <source-password>#PASSWORD#</source-password>
+ <!-- Relays log in username 'relay' -->
+ <relay-password>#PASSWORD#</relay-password>
+
+ <!-- Admin logs in with the username given below -->
+ <admin-user>admin</admin-user>
+ <admin-password>#PASSWORD#</admin-password>
+ </authentication>
+
+ <!-- This is the hostname other people will use to connect to your server.
+ It affects mainly the urls generated by Icecast for playlists and yp
+ listings. -->
+ <!-- Inside the conference, video.debconf.org should resolve to this
+ server (known externally as int-master.video.debconf.org). -->
+ <hostname>int-master.video.debconf.org</hostname>
+
+ <listen-socket>
+ <port>8000</port>
+ </listen-socket>
+
+ <fileserve>0</fileserve>
+
+ <mount>
+ <mount-name>/Salon_del_mar.ogv</mount-name>
+ <fallback-mount>/replay-int.ogv</fallback-mount>
+ <fallback-override>1</fallback-override>
+ </mount>
+
+ <mount>
+ <mount-name>/Microcine.ogv</mount-name>
+ <fallback-mount>/replay-int.ogv</fallback-mount>
+ <fallback-override>1</fallback-override>
+ </mount>
+
+ <mount>
+ <mount-name>/replay-int.ogv</mount-name>
+ <hidden>1</hidden>
+ </mount>
+
+ <paths>
+ <!-- basedir is only used if chroot is enabled -->
+ <basedir>/usr/share/icecast2</basedir>
+
+ <!-- Note that if <chroot> is turned on below, these paths must both
+ be relative to the new root, not the original root -->
+ <logdir>/var/log/icecast2</logdir>
+ <webroot>/usr/share/icecast2/web</webroot>
+ <adminroot>/usr/share/icecast2/admin</adminroot>
+
+ <!-- Aliases: can also be used for simple redirections as well,
+ this example will redirect all requests for http://server:port/ to
+ the status page
+ -->
+ <alias source="/" dest="/status.xsl"/>
+ </paths>
+
+ <logging>
+ <accesslog>access.log</accesslog>
+ <errorlog>error.log</errorlog>
+ <loglevel>4</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error -->
+ <logsize>100000</logsize> <!-- Max size of a logfile -->
+ <logarchive>1</logarchive>
+ </logging>
+
+ <security>
+ <chroot>0</chroot>
+ </security>
+</icecast>
Property changes on: package/trunk/conf/streaming/dc8/icecast-dc-int-master.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: package/trunk/conf/streaming/dc8/icecast-dc-relay.xml (from rev 288, package/trunk/conf/icecast-dc-relay.xml)
===================================================================
--- package/trunk/conf/streaming/dc8/icecast-dc-relay.xml (rev 0)
+++ package/trunk/conf/streaming/dc8/icecast-dc-relay.xml 2009-02-05 20:16:18 UTC (rev 291)
@@ -0,0 +1,119 @@
+<icecast>
+ <limits>
+ <!-- Clients will use up to about 300 kbit/s each. Adjust
+ this limit to suit your bandwidth allocation. -->
+ <clients>300</clients>
+ <!-- Maximum number of relayed sources. -->
+ <sources>10</sources>
+ <threadpool>10</threadpool>
+ <queue-size>524288</queue-size>
+ <client-timeout>30</client-timeout>
+ <header-timeout>15</header-timeout>
+ <source-timeout>10</source-timeout>
+ <!-- If enabled, this will provide a burst of data when a client
+ first connects, thereby significantly reducing the startup
+ time for listeners that do substantial buffering. However,
+ it also significantly increases latency between the source
+ client and listening client. For low-latency setups, you
+ might want to disable this. -->
+ <burst-size>65536</burst-size>
+ </limits>
+
+ <authentication>
+ <!-- Sources log in with username 'source' -->
+ <source-password>#PASSWORD#</source-password>
+ <!-- Relays log in username 'relay' -->
+ <relay-password>#PASSWORD#</relay-password>
+
+ <!-- Admin logs in with the username given below -->
+ <admin-user>admin</admin-user>
+ <admin-password>#PASSWORD#</admin-password>
+ </authentication>
+
+ <!-- This is the hostname other people will use to connect to your server.
+ It affects mainly the urls generated by Icecast for playlists and yp
+ listings. -->
+ <!-- Outside the conference, video.debconf.org should resolve to
+ many relay servers. -->
+ <hostname>video.debconf.org</hostname>
+
+ <listen-socket>
+ <port>8000</port>
+ </listen-socket>
+
+ <fileserve>0</fileserve>
+
+ <relay>
+ <server>ext-master.video.debconf.org</server>
+ <port>8000</port>
+ <mount>/Salon_del_mar.ogv</mount>
+ <username>relay</username>
+ <password>#PASSWORD#</password>
+ <on-demand>1</on-demand>
+ </relay>
+
+ <relay>
+ <server>ext-master.video.debconf.org</server>
+ <port>8000</port>
+ <mount>/Microcine.ogv</mount>
+ <username>relay</username>
+ <password>#PASSWORD#</password>
+ <on-demand>1</on-demand>
+ </relay>
+
+ <relay>
+ <server>ext-master.video.debconf.org</server>
+ <port>8000</port>
+ <mount>/replay-ext.ogv</mount>
+ <username>relay</username>
+ <password>#PASSWORD#</password>
+ <on-demand>1</on-demand>
+ </relay>
+
+
+ <mount>
+ <mount-name>/Salon_del_mar.ogv</mount-name>
+ <fallback-mount>/replay-ext.ogv</fallback-mount>
+ <fallback-override>1</fallback-override>
+ </mount>
+
+ <mount>
+ <mount-name>/Microcine.ogv</mount-name>
+ <fallback-mount>/replay-ext.ogv</fallback-mount>
+ <fallback-override>1</fallback-override>
+ </mount>
+
+ <mount>
+ <mount-name>/replay-ext.ogv</mount-name>
+ <hidden>0</hidden>
+ </mount>
+
+ <paths>
+ <!-- basedir is only used if chroot is enabled -->
+ <basedir>/usr/share/icecast2</basedir>
+
+ <!-- Note that if <chroot> is turned on below, these paths must both
+ be relative to the new root, not the original root -->
+ <logdir>/var/log/icecast2</logdir>
+ <webroot>/usr/share/icecast2/web</webroot>
+ <adminroot>/usr/share/icecast2/admin</adminroot>
+
+ <!-- Aliases: can also be used for simple redirections as well,
+ this example will redirect all requests for http://server:port/ to
+ the status page
+ -->
+ <alias source="/" dest="/status.xsl"/>
+ </paths>
+
+ <logging>
+ <accesslog>access.log</accesslog>
+ <errorlog>error.log</errorlog>
+ <loglevel>4</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error -->
+ <logsize>100000</logsize> <!-- Max size of a logfile -->
+ <logarchive>1</logarchive>
+ </logging>
+
+ <security>
+ <chroot>0</chroot>
+ </security>
+</icecast>
Property changes on: package/trunk/conf/streaming/dc8/icecast-dc-relay.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: package/trunk/conf/streaming/fosdem09/ezstream-fosdem-replay.xml (from rev 288, package/trunk/conf/ezstream-dc-ext-replay.xml)
===================================================================
--- package/trunk/conf/streaming/fosdem09/ezstream-fosdem-replay.xml (rev 0)
+++ package/trunk/conf/streaming/fosdem09/ezstream-fosdem-replay.xml 2009-02-05 20:16:18 UTC (rev 291)
@@ -0,0 +1,12 @@
+<ezstream>
+ <url>http://apu.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>fosdem-fallback</svrinfoname>
+ <svrinfogenre>Talk</svrinfogenre>
+ <svrinfodescription>FOSDEM_Talk_Replay</svrinfodescription>
+</ezstream>
Property changes on: package/trunk/conf/streaming/fosdem09/ezstream-fosdem-replay.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: package/trunk/conf/streaming/fosdem09/icecast-fosdem-master.xml (from rev 288, package/trunk/conf/icecast-dc-int-master.xml)
===================================================================
--- package/trunk/conf/streaming/fosdem09/icecast-fosdem-master.xml (rev 0)
+++ package/trunk/conf/streaming/fosdem09/icecast-fosdem-master.xml 2009-02-05 20:16:18 UTC (rev 291)
@@ -0,0 +1,82 @@
+<icecast>
+ <limits>
+ <clients>300</clients>
+ <sources>10</sources>
+ <threadpool>10</threadpool>
+ <queue-size>524288</queue-size>
+ <client-timeout>30</client-timeout>
+ <header-timeout>15</header-timeout>
+ <source-timeout>10</source-timeout>
+ <!-- If enabled, this will provide a burst of data when a client
+ first connects, thereby significantly reducing the startup
+ time for listeners that do substantial buffering. However,
+ it also significantly increases latency between the source
+ client and listening client. For low-latency setups, you
+ might want to disable this. -->
+ <burst-size>65536</burst-size>
+ </limits>
+
+ <authentication>
+ <!-- Sources log in with username 'source' -->
+ <source-password>#PASSWORD#</source-password>
+ <!-- Relays log in username 'relay' -->
+ <relay-password>#PASSWORD#</relay-password>
+
+ <!-- Admin logs in with the username given below -->
+ <admin-user>admin</admin-user>
+ <admin-password>#PASSWORD#</admin-password>
+ </authentication>
+
+ <!-- This is the hostname other people will use to connect to your server.
+ It affects mainly the urls generated by Icecast for playlists and yp
+ listings. -->
+ <!-- Inside the conference, video.debconf.org should resolve to this
+ server (known externally as int-master.video.debconf.org). -->
+ <hostname>apu.debconf.org</hostname>
+
+ <listen-socket>
+ <port>8000</port>
+ </listen-socket>
+
+ <fileserve>0</fileserve>
+
+ <mount>
+ <mount-name>/DebianFOSDEM2009.ogv</mount-name>
+ <fallback-mount>/replay.ogv</fallback-mount>
+ <fallback-override>1</fallback-override>
+ </mount>
+
+ <mount>
+ <mount-name>/replay.ogv</mount-name>
+ <hidden>0</hidden>
+ </mount>
+
+ <paths>
+ <!-- basedir is only used if chroot is enabled -->
+ <basedir>/usr/share/icecast2</basedir>
+
+ <!-- Note that if <chroot> is turned on below, these paths must both
+ be relative to the new root, not the original root -->
+ <logdir>/var/log/icecast2</logdir>
+ <webroot>/usr/share/icecast2/web</webroot>
+ <adminroot>/usr/share/icecast2/admin</adminroot>
+
+ <!-- Aliases: can also be used for simple redirections as well,
+ this example will redirect all requests for http://server:port/ to
+ the status page
+ -->
+ <alias source="/" dest="/status.xsl"/>
+ </paths>
+
+ <logging>
+ <accesslog>access.log</accesslog>
+ <errorlog>error.log</errorlog>
+ <loglevel>4</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error -->
+ <logsize>100000</logsize> <!-- Max size of a logfile -->
+ <logarchive>1</logarchive>
+ </logging>
+
+ <security>
+ <chroot>0</chroot>
+ </security>
+</icecast>
Property changes on: package/trunk/conf/streaming/fosdem09/icecast-fosdem-master.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: package/trunk/conf/streaming/fosdem09/icecast-fosdem-relay.xml (from rev 288, package/trunk/conf/icecast-dc-relay.xml)
===================================================================
--- package/trunk/conf/streaming/fosdem09/icecast-fosdem-relay.xml (rev 0)
+++ package/trunk/conf/streaming/fosdem09/icecast-fosdem-relay.xml 2009-02-05 20:16:18 UTC (rev 291)
@@ -0,0 +1,103 @@
+<icecast>
+ <limits>
+ <!-- Clients will use up to about 300 kbit/s each. Adjust
+ this limit to suit your bandwidth allocation. -->
+ <clients>300</clients>
+ <!-- Maximum number of relayed sources. -->
+ <sources>10</sources>
+ <threadpool>10</threadpool>
+ <queue-size>524288</queue-size>
+ <client-timeout>30</client-timeout>
+ <header-timeout>15</header-timeout>
+ <source-timeout>10</source-timeout>
+ <!-- If enabled, this will provide a burst of data when a client
+ first connects, thereby significantly reducing the startup
+ time for listeners that do substantial buffering. However,
+ it also significantly increases latency between the source
+ client and listening client. For low-latency setups, you
+ might want to disable this. -->
+ <burst-size>65536</burst-size>
+ </limits>
+
+ <authentication>
+ <!-- Sources log in with username 'source' -->
+ <source-password>#PASSWORD#</source-password>
+ <!-- Relays log in username 'relay' -->
+ <relay-password>#PASSWORD#</relay-password>
+
+ <!-- Admin logs in with the username given below -->
+ <admin-user>admin</admin-user>
+ <admin-password>#PASSWORD#</admin-password>
+ </authentication>
+
+ <!-- This is the hostname other people will use to connect to your server.
+ It affects mainly the urls generated by Icecast for playlists and yp
+ listings. -->
+ <!-- Outside the conference, video.debconf.org should resolve to
+ many relay servers. -->
+ <hostname>video.debconf.org</hostname>
+
+ <listen-socket>
+ <port>8000</port>
+ </listen-socket>
+
+ <fileserve>0</fileserve>
+
+ <relay>
+ <server>apu.debconf.org</server>
+ <port>8000</port>
+ <mount>/DebianFOSDEM2009.ogv</mount>
+ <username>relay</username>
+ <password>#PASSWORD#</password>
+ <on-demand>1</on-demand>
+ </relay>
+
+ <relay>
+ <server>apu.debconf.org</server>
+ <port>8000</port>
+ <mount>/replay.ogv</mount>
+ <username>relay</username>
+ <password>#PASSWORD#</password>
+ <on-demand>1</on-demand>
+ </relay>
+
+ <mount>
+ <mount-name>/DebianFOSDEM2009.ogv</mount-name>
+ <fallback-mount>/replay.ogv</fallback-mount>
+ <fallback-override>1</fallback-override>
+ </mount>
+
+ <mount>
+ <mount-name>/replay.ogv</mount-name>
+ <hidden>0</hidden>
+ </mount>
+
+ <paths>
+ <!-- basedir is only used if chroot is enabled -->
+ <basedir>/usr/share/icecast2</basedir>
+
+ <!-- Note that if <chroot> is turned on below, these paths must both
+ be relative to the new root, not the original root -->
+ <logdir>/var/log/icecast2</logdir>
+ <webroot>/usr/share/icecast2/web</webroot>
+ <adminroot>/usr/share/icecast2/admin</adminroot>
+
+ <!-- Aliases: can also be used for simple redirections as well,
+ this example will redirect all requests for http://server:port/ to
+ the status page
+ -->
+ <alias source="/" dest="/status.xsl"/>
+ </paths>
+
+ <logging>
+ <accesslog>access.log</accesslog>
+ <errorlog>error.log</errorlog>
+ <loglevel>4</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error -->
+ <logsize>100000</logsize> <!-- Max size of a logfile -->
+ <logarchive>1</logarchive>
+ </logging>
+
+ <security>
+ <chroot>0</chroot>
+ </security>
+</icecast>
Property changes on: package/trunk/conf/streaming/fosdem09/icecast-fosdem-relay.xml
___________________________________________________________________
Name: svn:mergeinfo
+
More information about the Debconf-video-commits
mailing list