summaryrefslogtreecommitdiffstats
path: root/roles/stream/templates/icecast.xml
diff options
context:
space:
mode:
Diffstat (limited to 'roles/stream/templates/icecast.xml')
-rw-r--r--roles/stream/templates/icecast.xml32
1 files changed, 30 insertions, 2 deletions
diff --git a/roles/stream/templates/icecast.xml b/roles/stream/templates/icecast.xml
index d97a515..06830d3 100644
--- a/roles/stream/templates/icecast.xml
+++ b/roles/stream/templates/icecast.xml
@@ -200,6 +200,8 @@
<public>1</public>
<on-connect>/usr/local/bin/{{ emacsconf_id }}-lowres-{{ track.id }}-on-connect</on-connect>
<on-disconnect>/usr/local/bin/{{ emacsconf_id }}-lowres-{{ track.id }}-on-disconnect</on-disconnect>
+ <fallback-mount>/{{ track.id }}-sorry.webm</fallback-mount>
+ <fallback-override>1</fallback-override>
</mount>
<mount type="normal">
<mount-name>/{{ track.id }}-host.webm</mount-name>
@@ -221,6 +223,32 @@
<stream-url>{{ track.watch_lowres }}</stream-url>
<type>video/webm</type>
<public>1</public>
+ <fallback-mount>/{{ track.id }}-480p-sorry.webm</fallback-mount>
+ <fallback-override>1</fallback-override>
+ </mount>
+ <mount type="normal">
+ <mount-name>/{{ track.id }}-sorry.webm</mount-name>
+ <username>{{ icecast_emacsconf_user }}</username>
+ <password>{{ icecast_emacsconf_password }}</password>
+ <stream-name>EmacsConf {{ emacsconf_year }} - {{ track.name }} - fallback track</stream-name>
+ <stream-description>The fallback stream for the {{ track.name }} track of {{ emacsconf_name }} {{ emacsconf_year }}</stream-description>
+ <stream-url>{{ track.watch }}</stream-url>
+ <type>video/webm</type>
+ <public>1</public>
+ <hidden>1</hidden>
+ <!--fallback-mount>/{{ track.id }}-fallback.webm</fallback-mount-->
+ </mount>
+ <mount type="normal">
+ <mount-name>/{{ track.id }}-480p-sorry.webm</mount-name>
+ <username>{{ icecast_emacsconf_user }}</username>
+ <password>{{ icecast_emacsconf_password }}</password>
+ <stream-name>EmacsConf {{ emacsconf_year }} - {{ track.name }} - fallback track</stream-name>
+ <stream-description>The low-res fallback stream for the {{ track.name }} track of {{ emacsconf_name }} {{ emacsconf_year }}</stream-description>
+ <stream-url>{{ track.watch }}</stream-url>
+ <type>video/webm</type>
+ <public>1</public>
+ <hidden>1</hidden>
+ <!--fallback-mount>/{{ track.id }}-fallback.webm</fallback-mount-->
</mount>
{% endfor %}
{% if icecast_mounts is defined %}
@@ -279,8 +307,8 @@
</paths>
<logging>
- <accesslog>access.log</accesslog>
- <errorlog>error.log</errorlog>
+ <accesslog>emacsconf-access.log</accesslog>
+ <errorlog>emacsconf-error.log</errorlog>
<!-- <playlistlog>playlist.log</playlistlog> -->
<loglevel>3</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error -->
<logsize>10000</logsize> <!-- Max size of a logfile -->