From 1a07538253b49a1e12df144f2c005898d52be99f Mon Sep 17 00:00:00 2001
From: Sacha Chua <sacha@sachachua.com>
Date: Thu, 24 Nov 2022 10:12:59 -0500
Subject: restream, go back to old mount structure

---
 roles/stream/templates/icecast.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'roles/stream/templates/icecast.xml')

diff --git a/roles/stream/templates/icecast.xml b/roles/stream/templates/icecast.xml
index cf6ec41..37e1a0a 100644
--- a/roles/stream/templates/icecast.xml
+++ b/roles/stream/templates/icecast.xml
@@ -169,7 +169,7 @@
                 <header name="Access-Control-Allow-Origin" value="http://webplayer.example.org" />
                 <header name="baz" value="quux" />
         </http-headers>
-        <on-connect>/home/icecast/bin/stream-start</on-connect>
+        <on-connect>/home/icecast/bin/stream-startg</on-connect>
         <on-disconnect>/home/icecast/bin/stream-stop</on-disconnect>
     </mount>
     -->
@@ -189,7 +189,7 @@
     -->
     {% for track in emacsconf_tracks %}
     <mount type="normal">
-        <mount-name>/{{ track.id }}.webm</mount-name>
+        <mount-name>/{{ emacsconf_id }}/{{ 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 %}
@@ -202,7 +202,7 @@
         <on-disconnect>/usr/local/bin/{{ emacsconf_id }}-lowres-{{ track.id }}-on-disconnect</on-disconnect>
     </mount>
     <mount type="normal">
-        <mount-name>/{{ track.id }}-host.webm</mount-name>
+        <mount-name>/{{ emacsconf_id }}/{{ 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>/{{ track.id }}-480p.webm</mount-name>
+        <mount-name>/{{ emacsconf_id }}/{{ 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>
-- 
cgit v1.2.3