[Debconf-video-commits] r146 - package/trunk/conf
edrz-guest at alioth.debian.org
edrz-guest at alioth.debian.org
Mon Aug 4 23:58:25 UTC 2008
Author: edrz-guest
Date: 2008-08-04 23:58:25 +0000 (Mon, 04 Aug 2008)
New Revision: 146
Removed:
package/trunk/conf/icecast-dc-apu.xml
Modified:
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
Log:
working icecast & ezstream config. apu becomes like other relays.
Modified: package/trunk/conf/ezstream-dc-ext-replay.xml
===================================================================
--- package/trunk/conf/ezstream-dc-ext-replay.xml 2008-08-04 23:23:39 UTC (rev 145)
+++ package/trunk/conf/ezstream-dc-ext-replay.xml 2008-08-04 23:58:25 UTC (rev 146)
@@ -1,5 +1,5 @@
<ezstream>
- <url>http://apu.debconf.org:8000/replay.ogv</url>
+ <url>http://ext-master.video.debconf.org:8000/replay-ext.ogv</url>
<sourcepassword>#PASSWORD#</sourcepassword>
<format>THEORA</format>
<filename>#PLAYLIST_PATH#</filename>
Modified: package/trunk/conf/ezstream-dc-int-replay.xml
===================================================================
--- package/trunk/conf/ezstream-dc-int-replay.xml 2008-08-04 23:23:39 UTC (rev 145)
+++ package/trunk/conf/ezstream-dc-int-replay.xml 2008-08-04 23:58:25 UTC (rev 146)
@@ -1,5 +1,5 @@
<ezstream>
- <url>http://int-master.video.debconf.org:8000/replay.ogv</url>
+ <url>http://int-master.video.debconf.org:8000/replay-int.ogv</url>
<sourcepassword>#PASSWORD#</sourcepassword>
<format>THEORA</format>
<filename>#PLAYLIST_PATH#</filename>
Deleted: package/trunk/conf/icecast-dc-apu.xml
===================================================================
--- package/trunk/conf/icecast-dc-apu.xml 2008-08-04 23:23:39 UTC (rev 145)
+++ package/trunk/conf/icecast-dc-apu.xml 2008-08-04 23:58:25 UTC (rev 146)
@@ -1,104 +0,0 @@
-<icecast>
- <limits>
- <clients>300</clients>
- <sources>10</sources>
- <threadpool>10</threadpool>
- <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
- 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. -->
- <hostname>apu.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>
-
- <mount>
- <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>
-
- <!-- 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>
Modified: package/trunk/conf/icecast-dc-ext-master.xml
===================================================================
--- package/trunk/conf/icecast-dc-ext-master.xml 2008-08-04 23:23:39 UTC (rev 145)
+++ package/trunk/conf/icecast-dc-ext-master.xml 2008-08-04 23:58:25 UTC (rev 146)
@@ -3,17 +3,17 @@
<clients>300</clients>
<sources>10</sources>
<threadpool>10</threadpool>
- <queue-size>2097152</queue-size>
- <client-timeout>60</client-timeout>
+ <queue-size>524288</queue-size>
+ <client-timeout>30</client-timeout>
<header-timeout>15</header-timeout>
- <source-timeout>60</source-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>
+ <burst-size>65536</burst-size>
</limits>
<authentication>
@@ -38,16 +38,19 @@
<fileserve>0</fileserve>
- <master-server>int-master.video.debconf.org</master-server>
- <master-server-port>8000</master-server-port>
- <master-update-interval>20</master-update-interval>
- <master-password>#PASSWORD#</master-password>
- <relays-on-demand>1</relays-on-demand>
+ <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>apu.debconf.org</server>
+ <server>int-master.video.debconf.org</server>
<port>8000</port>
- <mount>/replay.ogv</mount>
+ <mount>/microcine.ogv</mount>
<username>relay</username>
<password>#PASSWORD#</password>
<on-demand>1</on-demand>
@@ -55,19 +58,14 @@
<mount>
<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-name>/replay-ext.ogv</mount-name>
</mount>
<paths>
Modified: package/trunk/conf/icecast-dc-int-master.xml
===================================================================
--- package/trunk/conf/icecast-dc-int-master.xml 2008-08-04 23:23:39 UTC (rev 145)
+++ package/trunk/conf/icecast-dc-int-master.xml 2008-08-04 23:58:25 UTC (rev 146)
@@ -4,9 +4,9 @@
<sources>10</sources>
<threadpool>10</threadpool>
<queue-size>2097152</queue-size>
- <client-timeout>60</client-timeout>
+ <client-timeout>30</client-timeout>
<header-timeout>15</header-timeout>
- <source-timeout>60</source-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,
@@ -42,18 +42,18 @@
<mount>
<mount-name>/salon_del_mar.ogv</mount-name>
- <fallback-mount>/replay.ogv</fallback-mount>
+ <fallback-mount>/replay-int.ogv</fallback-mount>
<fallback-override>1</fallback-override>
</mount>
<mount>
<mount-name>/microcine.ogv</mount-name>
- <fallback-mount>/replay.ogv</fallback-mount>
+ <fallback-mount>/replay-int.ogv</fallback-mount>
<fallback-override>1</fallback-override>
</mount>
<mount>
- <mount-name>/replay.ogv</mount-name>
+ <mount-name>/replay-int.ogv</mount-name>
<hidden>1</hidden>
</mount>
Modified: package/trunk/conf/icecast-dc-relay.xml
===================================================================
--- package/trunk/conf/icecast-dc-relay.xml 2008-08-04 23:23:39 UTC (rev 145)
+++ package/trunk/conf/icecast-dc-relay.xml 2008-08-04 23:58:25 UTC (rev 146)
@@ -6,17 +6,17 @@
<!-- Maximum number of relayed sources. -->
<sources>10</sources>
<threadpool>10</threadpool>
- <queue-size>2097152</queue-size>
- <client-timeout>60</client-timeout>
+ <queue-size>524288</queue-size>
+ <client-timeout>30</client-timeout>
<header-timeout>15</header-timeout>
- <source-timeout>60</source-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>
+ <burst-size>65536</burst-size>
</limits>
<authentication>
@@ -43,12 +43,51 @@
<fileserve>0</fileserve>
- <master-server>ext-master.video.debconf.org</master-server>
- <master-server-port>8000</master-server-port>
- <master-update-interval>20</master-update-interval>
- <master-password>#PASSWORD#</master-password>
- <relays-on-demand>1</relays-on-demand>
+ <relay>
+ <server>iobo.zhevny.com</server>
+ <port>8000</port>
+ <mount>/salon_del_mar.ogv</mount>
+ <username>relay</username>
+ <password>#PASSWORD#</password>
+ <on-demand>1</on-demand>
+ </relay>
+ <relay>
+ <server>iobo.zhevny.com</server>
+ <port>8000</port>
+ <mount>/microcine.ogv</mount>
+ <username>relay</username>
+ <password>#PASSWORD#</password>
+ <on-demand>1</on-demand>
+ </relay>
+
+ <relay>
+ <server>iobo.zhevny.com</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>
More information about the Debconf-video-commits
mailing list