summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--README.org30
-rw-r--r--group_vars/all.yml4
-rw-r--r--inventory.yml62
-rw-r--r--roles/obs/tasks/track.yml3
-rw-r--r--roles/prerec/tasks/main.yml2
-rwxr-xr-xroles/prerec/templates/process-prerec.sh4
6 files changed, 53 insertions, 52 deletions
diff --git a/README.org b/README.org
index 48403c5..2394f54 100644
--- a/README.org
+++ b/README.org
@@ -189,21 +189,10 @@ ansible-playbook -i inventory.yml prod-playbook.yml --tags test -e icecast_test_
Use a test pattern (don't know if this works)
ansible-playbook -i inventory.yml prod-playbook.yml --tags test -e icecast_test_track=dev -e icecast_test=pattern
-* Captioning
-
-Set up whisper:
-
-ansible-playbook -i inventory.yml prod-playbook.yml --tags caption
-
-Update caption script:
-
-ansible-playbook -i inventory.yml prod-playbook.yml --tags process-captions
+* OBS
-ffmpeg -y -i handwritten/reencode.webm -t 60 -vcodec copy -acodec copy test.webm
-* Other useful things
+ansible-playbook -i inventory.yml prod-playbook.yml --tags obs
-nodemon -w . -e yml -x 'ansible-playbook -i inventory.yml prod-playbook.yml --tags vnc; true'
-* OBS
Resizing VNC after connection
xrandr -s 1280x720
@@ -215,6 +204,19 @@ Update scenes from the gen copy:
ssh emacsconf-gen@res.emacsconf.org -p 46668 "cat ~/.config/obs-studio/basic/scenes/gen.json" | jq 'walk(if type == "string" then gsub("emacsconf"; "{{ emacsconf_id }}") | gsub("gen"; "{{ item.id }}") else . end)' > roles/obs/templates/scenes.json
ansible-playbook -i inventory.yml prod-playbook.yml --tags obs-scene
-
Update scenes from the dev copy:
ssh emacsconf-dev@res.emacsconf.org "cat ~/.config/obs-studio/basic/scenes/dev.json" | jq 'walk(if type == "string" then gsub("emacsconf"; "{{ emacsconf_id }}") | gsub("dev"; "{{ item.id }}") else . end)' > scenes.json
+* Captioning
+
+Set up whisper:
+
+ansible-playbook -i inventory.yml prod-playbook.yml --tags caption
+
+Update caption script:
+
+ansible-playbook -i inventory.yml prod-playbook.yml --tags process-captions
+
+ffmpeg -y -i handwritten/reencode.webm -t 60 -vcodec copy -acodec copy test.webm
+* Other useful things
+
+nodemon -w . -e yml -x 'ansible-playbook -i inventory.yml prod-playbook.yml --tags vnc; true'
diff --git a/group_vars/all.yml b/group_vars/all.yml
index 254effe..34fc98c 100644
--- a/group_vars/all.yml
+++ b/group_vars/all.yml
@@ -15,7 +15,7 @@ emacsconf_tracks:
vnc_id: 5
vnc_port: 5905
obs_websocket_port: 6005
- mumble_channel: Org
+ mumble_channel: emacsconf-gen
- name: Development
channel: emacsconf-dev
id: dev
@@ -24,7 +24,7 @@ emacsconf_tracks:
vnc_id: 6
vnc_port: 5906
obs_websocket_port: 6006
- mumble_channel: Lobby
+ mumble_channel: emacsconf-dev
icecast_emacsconf_user: emacsconf
emacsconf_home: /home/{{ emacsconf_user }}
emacsconf_font: "Sans Serif"
diff --git a/inventory.yml b/inventory.yml
index 59dfa11..98c4e2a 100644
--- a/inventory.yml
+++ b/inventory.yml
@@ -18,37 +18,37 @@ prod:
ansible_become: true
emacsconf_group: org
cpus: 12
- # front:
- # ansible_host: front0.emacsconf.org
- # remote_user: orga
- # ansible_ssh_user: orga
- # ansible_python_interpreter: /usr/bin/python3
- # ansible_become: true
- # pad:
- # ansible_host: front0.emacsconf.org
- # remote_user: orga
- # ansible_ssh_user: orga
- # ansible_python_interpreter: /usr/bin/python3
- # ansible_become: true
- # media:
- # ansible_host: media.emacsconf.org
- # remote_user: orga
- # ansible_ssh_user: orga
- # ansible_python_interpreter: /usr/bin/python3
- # ansible_become: true
- # host_name: media.emacsconf.org
- # upload:
- # ansible_host: media.emacsconf.org
- # remote_user: orga
- # ansible_ssh_user: orga
- # ansible_python_interpreter: /usr/bin/python3
- # ansible_become: true
- # stream:
- # ansible_host: live0.emacsconf.org
- # remote_user: orga
- # ansible_ssh_user: orga
- # ansible_python_interpreter: /usr/bin/python3
- # ansible_become: true
+ front:
+ ansible_host: front0.emacsconf.org
+ remote_user: orga
+ ansible_ssh_user: orga
+ ansible_python_interpreter: /usr/bin/python3
+ ansible_become: true
+ pad:
+ ansible_host: front0.emacsconf.org
+ remote_user: orga
+ ansible_ssh_user: orga
+ ansible_python_interpreter: /usr/bin/python3
+ ansible_become: true
+ media:
+ ansible_host: media.emacsconf.org
+ remote_user: orga
+ ansible_ssh_user: orga
+ ansible_python_interpreter: /usr/bin/python3
+ ansible_become: true
+ host_name: media.emacsconf.org
+ upload:
+ ansible_host: media.emacsconf.org
+ remote_user: orga
+ ansible_ssh_user: orga
+ ansible_python_interpreter: /usr/bin/python3
+ ansible_become: true
+ stream:
+ ansible_host: live0.emacsconf.org
+ remote_user: orga
+ ansible_ssh_user: orga
+ ansible_python_interpreter: /usr/bin/python3
+ ansible_become: true
all:
hosts:
localhost:
diff --git a/roles/obs/tasks/track.yml b/roles/obs/tasks/track.yml
index fe49116..889c9fd 100644
--- a/roles/obs/tasks/track.yml
+++ b/roles/obs/tasks/track.yml
@@ -86,9 +86,6 @@
state: directory
owner: "{{ emacsconf_user }}"
group: "{{ emacsconf_group }}"
- - name: Debug mumble
- debug:
- var: mumble_certificates['dev']
- name: Set up mumble
tags: mumble
template:
diff --git a/roles/prerec/tasks/main.yml b/roles/prerec/tasks/main.yml
index 032e3d2..15adde2 100644
--- a/roles/prerec/tasks/main.yml
+++ b/roles/prerec/tasks/main.yml
@@ -28,3 +28,5 @@
- upload.sh
- publish-backstage-index.sh
- update-emacsconf.sh
+ - thumbnail.sh
+
diff --git a/roles/prerec/templates/process-prerec.sh b/roles/prerec/templates/process-prerec.sh
index e49aa72..8fdca72 100755
--- a/roles/prerec/templates/process-prerec.sh
+++ b/roles/prerec/templates/process-prerec.sh
@@ -10,9 +10,9 @@ if ! ( screen -ls | grep -q $SLUG ); then
screen -dmS $SCREEN
fi
( cd /data/emacsconf/cache; ./update-cache )
-/data/emacsconf/2022/scripts/update-task-status.sh $SLUG "WAITING_FOR_PREREC" "PROCESSING"
+# /data/emacsconf/2022/scripts/update-task-status.sh $SLUG "WAITING_FOR_PREREC" "PROCESSING"
#if [[ ! -f "$REENCODED" ]]; then
-screen -S $SCREEN -X screen -t reencode-$SLUG /bin/bash -c "/data/emacsconf/2022/scripts/reencode.sh \"$ORIGINAL\" \"$REENCODED\" && /data/emacsconf/2022/scripts/upload.sh $REENCODED && exec /bin/bash" &
+screen -S $SCREEN -X screen -t reencode-$SLUG /bin/bash -c "/data/emacsconf/2022/scripts/reencode.sh \"$ORIGINAL\" \"$REENCODED\" && /data/emacsconf/2022/scripts/upload.sh $REENCODED $MAIN && /data/emacsconf/2022/scripts/thumbnail.sh \"$MAIN\" && /data/emacsconf/2022/scripts/upload.sh $(echo "$MAIN" | sed s/webm$/png/) exec /bin/bash" &
#fi
screen -S $SCREEN -X screen -t captions-$SLUG /bin/bash -c "/data/emacsconf/2022/scripts/process-captions.py $(dirname $ORIGINAL); /data/emacsconf/2022/scripts/update-task-status.sh $SLUG PROCESSING TO_ASSIGN; exec /bin/bash"
screen -x $SCREEN