summaryrefslogtreecommitdiffstats
path: root/roles/stream/templates
diff options
context:
space:
mode:
authorSacha Chua <sacha@sachachua.com>2022-11-08 12:00:47 -0500
committerSacha Chua <sacha@sachachua.com>2022-11-08 12:00:47 -0500
commitc2d647a3cb3a6d456684bcdce327954214352959 (patch)
tree4fe8bf78b9ef868453bb974758856b2c19c20830 /roles/stream/templates
parent5bf4ab50e13a9be2923ddebe69525b40df8ab3bc (diff)
downloademacsconf-ansible-c2d647a3cb3a6d456684bcdce327954214352959.tar.xz
emacsconf-ansible-c2d647a3cb3a6d456684bcdce327954214352959.zip
Update edit and publish configs, tweak OBS, add Mumble client
Diffstat (limited to '')
-rw-r--r--roles/stream/templates/icecast.xml6
-rwxr-xr-xroles/stream/templates/lowres.sh2
2 files changed, 4 insertions, 4 deletions
diff --git a/roles/stream/templates/icecast.xml b/roles/stream/templates/icecast.xml
index f9c3916..cf6ec41 100644
--- a/roles/stream/templates/icecast.xml
+++ b/roles/stream/templates/icecast.xml
@@ -189,7 +189,7 @@
-->
{% for track in emacsconf_tracks %}
<mount type="normal">
- <mount-name>/emacsconf/{{ 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 %}
@@ -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>
diff --git a/roles/stream/templates/lowres.sh b/roles/stream/templates/lowres.sh
index 1f74215..502fcb3 100755
--- a/roles/stream/templates/lowres.sh
+++ b/roles/stream/templates/lowres.sh
@@ -2,5 +2,5 @@
# {{ ansible_managed }}
sleep 10
for i in 1 2 3 4 5; do
- ffmpeg -loglevel 24 -f webm -reconnect_at_eof 1 -reconnect_streamed 1 -re -i "http://localhost:{{ icecast_port }}/{{ emacsconf_id }}/{{ item.id }}.webm" -vf scale="{{ icecast_lowres_scale }}" -f webm -c:a copy -b:v 500k -maxrate 1M -bufsize 1M -content_type video/webm -c:v libvpx "icecast://{{ icecast_emacsconf_user }}:{{ icecast_emacsconf_password }}@localhost:{{ icecast_port }}/{{ emacsconf_id }}/{{ item.id }}-480p.webm" >> {{ icecast_restream_dir }}/{{ emacsconf_id }}-lowres-{{ item.id }}.log || sleep 5
+ ffmpeg -loglevel 24 -f webm -reconnect_at_eof 1 -reconnect_streamed 1 -re -i "http://localhost:{{ icecast_port }}/{{ item.id }}.webm" -vf scale="{{ icecast_lowres_scale }}" -f webm -c:a copy -b:v 500k -maxrate 1M -bufsize 1M -content_type video/webm -c:v libvpx "icecast://{{ icecast_emacsconf_user }}:{{ icecast_emacsconf_password }}@localhost:{{ icecast_port }}/{{ item.id }}-480p.webm" >> {{ icecast_restream_dir }}/{{ emacsconf_id }}-lowres-{{ item.id }}.log || sleep 5
done