diff options
Diffstat (limited to 'roles/stream/templates/icecast.xml')
-rw-r--r-- | roles/stream/templates/icecast.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/roles/stream/templates/icecast.xml b/roles/stream/templates/icecast.xml index 37e1a0a..d97a515 100644 --- a/roles/stream/templates/icecast.xml +++ b/roles/stream/templates/icecast.xml @@ -189,10 +189,10 @@ --> {% for track in emacsconf_tracks %} <mount type="normal"> - <mount-name>/{{ emacsconf_id }}/{{ track.id }}.webm</mount-name> + <mount-name>/{{ track.id }}.webm</mount-name> <username>{{ icecast_emacsconf_user }}</username> <password>{{ icecast_emacsconf_password }}</password> - {% if icecast_save_dump %}<dump-file>/data/{{ emacsconf_id }}-{{ emacsconf_year }}-{{ track.id }}_%Y-%m-%d_%H-%M-%S.webm</dump-file>{% endif %} + {% if not test_mode %}<dump-file>/data/{{ emacsconf_id }}-{{ emacsconf_year }}-{{ track.id }}_%Y-%m-%d_%H-%M-%S.webm</dump-file>{% endif %} <stream-name>{{ emacsconf_name }} {{ emacsconf_year }} - {{ track.name }} track</stream-name> <stream-description>The livestream for the {{ track.name }} track of {{ emacsconf_name }} {{ emacsconf_year }}</stream-description> <stream-url>{{ track.watch }}</stream-url> @@ -202,7 +202,7 @@ <on-disconnect>/usr/local/bin/{{ emacsconf_id }}-lowres-{{ track.id }}-on-disconnect</on-disconnect> </mount> <mount type="normal"> - <mount-name>/{{ emacsconf_id }}/{{ track.id }}-host.webm</mount-name> + <mount-name>/{{ track.id }}-host.webm</mount-name> <username>{{ icecast_emacsconf_user }}</username> <password>{{ icecast_emacsconf_password }}</password> <stream-name>EmacsConf {{ emacsconf_year }} - {{ track.name }} track</stream-name> @@ -213,7 +213,7 @@ <hidden>1</hidden> </mount> <mount type="normal"> - <mount-name>/{{ emacsconf_id }}/{{ track.id }}-480p.webm</mount-name> + <mount-name>/{{ track.id }}-480p.webm</mount-name> <username>{{ icecast_emacsconf_user }}</username> <password>{{ icecast_emacsconf_password }}</password> <stream-name>{{ emacsconf_name }} {{ emacsconf_year }} - {{ track.name }} track (480p)</stream-name> |