diff options
| author | Sacha Chua <sacha@sachachua.com> | 2022-10-29 07:33:39 -0400 |
|---|---|---|
| committer | Sacha Chua <sacha@sachachua.com> | 2022-10-29 07:33:39 -0400 |
| commit | a6a373410bde6918f27992ff967660c0541f810a (patch) | |
| tree | ab8fbd6a5e12f065a7af82027b98df818dfb9603 /roles/stream/templates/icecast.xml | |
| parent | bff9ceae7f42723f939f620f9ef9faebca966742 (diff) | |
| download | emacsconf-ansible-a6a373410bde6918f27992ff967660c0541f810a.tar.xz emacsconf-ansible-a6a373410bde6918f27992ff967660c0541f810a.zip | |
media, wiki-publish, caption updates
* common-playbook.yml: Start moving publishing setup to res
* group_vars/all.yml: New common variables.
* inventory.yml (prod): Number of threads, new hosts
* roles/caption/templates/process-captions.py: Add mp4, try to figure
out why script was failing, simplify
* roles/media/tasks/main.yml: New role for setting up
media.emacsconf.org for this year
* roles/prerec/templates/reencode.sh: Keep a copy of zaeph's script
* roles/stream/defaults/main.yml: Add more variables
* roles/stream: Restreaming lowres
* roles/wiki-publish/tasks/emacs.yml: Build Emacs from source
Diffstat (limited to 'roles/stream/templates/icecast.xml')
| -rw-r--r-- | roles/stream/templates/icecast.xml | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/roles/stream/templates/icecast.xml b/roles/stream/templates/icecast.xml index d2bb89c..e09e6a0 100644 --- a/roles/stream/templates/icecast.xml +++ b/roles/stream/templates/icecast.xml @@ -190,33 +190,35 @@ {% for track in emacsconf_tracks %} <mount type="normal"> <mount-name>/emacsconf/{{ track.id }}.webm</mount-name> - <username>emacsconf</username> + <username>{{ icecast_emacsconf_user }}</username> <password>{{ icecast_emacsconf_password }}</password> - <dump-file>/data/emacsconf-{{ emacsconf_year }}-{{ track.id }}_%Y-%m-%d_%H-%M-%S.webm</dump-file> - <stream-name>EmacsConf {{ emacsconf_year }} - {{ track.name }} track</stream-name> - <stream-description>The livestream for the {{ track.name }} track of EmacsConf {{ emacsconf_year }}</stream-description> - <stream-url>https://emacsconf.org/{{ emacsconf_year }}/watch/{{ track.id }}/</stream-url> + <dump-file>/data/{{ emacsconf_id }}-{{ emacsconf_year }}-{{ track.id }}_%Y-%m-%d_%H-%M-%S.webm</dump-file> + <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> <type>video/webm</type> <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> </mount> <mount type="normal"> - <mount-name>/emacsconf/{{ track.id }}-host.webm</mount-name> - <username>emacsconf</username> + <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> - <stream-description>The host stream for the {{ track.name }} track of EmacsConf {{ emacsconf_year }}</stream-description> - <stream-url>https://emacsconf.org/{{ emacsconf_year }}/watch/{{ track.id }}/</stream-url> + <stream-description>The host 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> </mount> <mount type="normal"> - <mount-name>/emacsconf/{{ track.id }}-480p.webm</mount-name> - <username>emacsconf</username> + <mount-name>/{{ emacsconf_id }}/{{ track.id }}-480p.webm</mount-name> + <username>{{ icecast_emacsconf_user }}</username> <password>{{ icecast_emacsconf_password }}</password> - <stream-name>EmacsConf {{ emacsconf_year }} - {{ track.name }} track (480p)</stream-name> - <stream-description>The 480p livestream for the {{ track.name }} track of EmacsConf {{ emacsconf_year }}</stream-description> - <stream-url>https://emacsconf.org/{{ emacsconf_year }}/watch/{{ track.id }}/</stream-url> + <stream-name>{{ emacsconf_name }} {{ emacsconf_year }} - {{ track.name }} track (480p)</stream-name> + <stream-description>The low-res livestream for the {{ track.name }} track of {{ emacsconf_name }} {{ emacsconf_year }}</stream-description> + <stream-url>{{ track.watch_lowres }}</stream-url> <type>video/webm</type> <public>1</public> </mount> |