Schedule and playbook updates

2 files changed, 218 insertions, 92 deletions

diff --git a/playbook.md b/playbook.md
index 77f82c13..04645e33 100644
--- a/playbook.md
+++ b/playbook.md
@@ -2,7 +2,6 @@
 [[!toc levels=4]]
 
 -   [Export and tangle]((progn (org-md-export-to-markdown) (org-babel-tangle)))
--   [Execute buffer]((org-babel-execute-buffer))
 
 
 # Roles/values
@@ -51,7 +50,13 @@
 <tbody>
 <tr>
 <td class="org-left">${protected}</td>
-<td class="org-left"><code>front:/var/www/media.emacsconf.org/2021/protected/</code></td>
+<td class="org-left"><a href="file://ssh:front:/var/www/media.emacsconf.org/2021/protected/">file://ssh:front:/var/www/media.emacsconf.org/2021/protected/</a></td>
+</tr>
+
+
+<tr>
+<td class="org-left">${stream-status}</td>
+<td class="org-left"><a href="file://ssh:live:/var/www/html/index.html">file://ssh:live:/var/www/html/index.html</a></td>
 </tr>
 </tbody>
 </table>
@@ -59,9 +64,14 @@
 
 # Pre-conference dry run
 
--   [ ] [Start streaming](#orgf9d4023)
--   [ ] [Start low-resolution stream](#org3cad2c8)
--   [ ] [Start Youtube stream](#org719908a)
+-   [ ] [Start streaming](#org264efc8)
+-   [ ] [Start low-resolution stream](#org46f6925)
+-   [ ] [Start Youtube stream](#orgcfa71d3)
+-   [ ] Check in a speaker
+-   [ ] Try alternate stream
+-   [ ] Try publication process
+-   [ ] Review the playbook
+-   [ ] Sort out CRDT
 
 
 # Thursday or Friday before the conference
@@ -75,7 +85,7 @@
 ## Set up
 
 
-<a id="orgf9d4023"></a>
+<a id="org264efc8"></a>
 
 ### Start streaming     :stream:
 
@@ -85,7 +95,7 @@
 Update <file://ssh:live:/var/www/html/index.html>
 
 
-<a id="org3cad2c8"></a>
+<a id="org46f6925"></a>
 
 ### Start low-resolution stream     :check:
 
@@ -94,7 +104,7 @@ Call this on live0 with the password as the first parameter. The Icecast configu
     while true; do ffmpeg -f webm -reconnect_at_eof 1 -reconnect_streamed 1  -re -i http://localhost:8000/main.webm -vf scale=854:480 -f webm -c:a copy -b:v 500k -maxrate 1M -bufsize 1M  -content_type video/webm -c:v libvpx icecast://ec2020main480pmu:${1}:8000/main-480p.webm; done
 
 
-<a id="org719908a"></a>
+<a id="orgcfa71d3"></a>
 
 ### Start Youtube stream     :check:
 
@@ -109,12 +119,15 @@ Call this on live0 with the Youtube RTMP streaming key as the first parameter.
 ### Check in speaker
 
 -   Speaker checks in on #emacsconf-org via IRC or via e-mail ~30m before
--   CHECK notes IRC nick: `/conf set <slug> irc <nick>` or `M-g t <slug> C-. p IRC <nick>`
+-   CHECK notes IRC nick for speaker.  `M-g t <slug> C-. p IRC <nick>`  (using Embark and conf-go-to-talk)
 -   CHECK confirms Q&A preference: live/IRC/Etherpad, preferred way of getting questions
 -   [? unknown] How would you like to handle questions today? Live video, #emacsconf, Etherpad?
--   [? IRC] You can keep an eye on #emacsconf for questions and discussions related to your talk. Feel free to answer, skip answering, tell people that you'll follow up afterwards, etc. We'll also copy questions from the Etherpad so that you can see them in one place. Let us know if you need help!
--   [? Etherpad] The Etherpad is at ${etherpad-url} . Would you like to find the section for your talk and get comfortable? We'll copy questions from IRC over to the pad so that you can see them. Feel free to answer, skip answering, tell people that you'll follow up afterwards, etc. Let us know if you need help!
--   [? live] Our notes say you're thinking of handling questions live. I'll set you up in a BigBlueButton room so that you can get settled in.
+-   [? IRC] You can keep an eye on #emacsconf for questions and discussions related to your talk. Feel free to answer, skip answering, tell people that you'll follow up afterwards, etc. We'll also copy questions from the Etherpad so that you can see them in one place. Let us know if you need help or if you want to get set up for live Q&A! (If the volume gets overwhelming, we can copy questions into #emacsconf-questions for you.)
+-   [? Etherpad] The Etherpad is at ${etherpad-url} . Would you like to find the section for your talk and get comfortable? We'll copy questions from IRC over to the pad so that you can see them. Feel free to answer, skip answering, tell people that you'll follow up afterwards, etc. Let us know if you need help or if you want to get set up for live Q&A!
+-   [? live] Are you thinking of handling questions over a web
+    conference? I'll set you up in a BigBlueButton room so that you can
+    get settled in. Let us know if you want to handle questions by IRC
+    or Etherpad instead.
     -   CHECK directs speaker to available room with `/checkin <room> <nick>`
     -   Speaker joins talk room
     -   CHECK makes speaker presenter and moderator, does last-minute tech check
@@ -122,64 +135,110 @@ Call this on live0 with the Youtube RTMP streaming key as the first parameter.
         -   Speaker tries screen sharing and webcam (optional)
         -   check screen readability
         -   CHECK briefs speaker on process, including:
-            -   live Q&A: reading questions themselves (can do in any order, can skip) or asking HOST to read questions to them
+            -   live Q&A: reading questions themselves (can do in any order,
+                can skip) or asking HOST to read questions to them
             -   encouragement of webcam, although it's optional
-            -   how STREAM will join shortly before the prerec ends and then give them the go-ahead
-            -   closing any tabs watching the stream as their talk starts (otherwise the audio is confusing)
-        -   If the speaker will be live for more than 10 minutes, CHECK collects emergency contact information (in case of technical issues)
+            -   how STREAM will join shortly before the prerec ends and then
+                give them the go-ahead
+            -   closing any tabs watching the stream as their talk starts
+                (otherwise the audio is confusing)
+        -   If the speaker will be giving a live presentation, CHECK
+            collects emergency contact information (in case of technical
+            issues) and /msgs it to HOST
         -   Okay to do other things until the prerec ends
-    -   CHECK notifies STREAM and HOST with link to the talk room and preferences for Q&A-
+    -   CHECK notifies STREAM and HOST with link to the talk room and preferences for Q&A-.
 
 
-### Play the prerec
+<a id="orgeae9b5c"></a>
 
--   STREAM switches to MPV scene in OBS and plays the captioned video.
--   CHECK publishes the video to media.emacsconf.org
--   CHECK updates the wiki page to include the video and any other published files.
+### Transition to talk
 
-
-### Q&A
-
--   [? live]
-    -   STREAM joins meeting and gives go-ahead
-    -   CHECK starts recording in BBB
-    -   CHECK announces on IRC
-    -   PAD clears the pad colours
--   [? IRC/pad/afterwards]
-    -   TO\_DECIDE:
-        -   OR:
-            -   STREAM joins organizer BBB meeting and HOST describes Q&A method
-            -   STREAM describes Q&A method and shows what's going on
-
-
-### Transition to next talk
-
--   When it's time to wrap up, HOST writes in Etherpad/IRC or nudges speaker verbally.
 -   [? next talk is prerec] 
     -   HOST introduces next talk.
     -   STREAM switches OBS scene to MPV.
     -   STREAM plays prerec in MPV.
 -   [? next talk is live]
-    -   Host stops recording in this room.
-    -   HOST and STREAM switch to the other BBB room.
-    -   Host starts recording in the other room.
+    -   HOST and STREAM switch to the talk BBB room.
+    -   HOST starts recording or confirms that it's already on.
+    -   STREAM gives the go-ahead.
     -   HOST introduces next talk.
+-   PAD backs up a copy of the pad.
+-   PAD clears pad colours.
+-   Exception: [Speaker does not have a prerec and has not checked in](#org03ea047)
+
+
+### Present talk
+
+-   [? prerec]
+    -   STREAM and HOST switch to the organizer room in BBB.
+    -   STREAM switches to MPV scene in OBS and plays the video (with captions if available).
+        -   Exception: [Last-minute prerecording submission](#org1c7436f)
+    -   CHECK notes the time that the presentation started, recalculates schedule, and publishes it.
+    -   CHECK publishes the video to media.emacsconf.org
+    -   CHECK updates the wiki page to include the video and any other published files.
+-   [? live]
+    -   Exception: [Speaker does not have a prerec and has not checked in](#org03ea047)
+    -   HOST joins the BBB room and double-checks that recording is on
+    -   STREAM joins the BBB room from the IRC /msg and gives the go-ahead
+    -   CHECK notes that this is a live presentation and that the recording will be posted after the conference.
+    -   CHECK notes the time that the presentation started, recalculates schedule, and publishes it.
+    -   Speaker presents.
+    -   [? talk needs to be wrapped up]
+        -   HOST nudges speaker verbally.
+
+
+### Handle Q&A
+
+Exceptions:
+
+-   [Speaker has not checked in](#orgf9944ea)
+
+-   [? live]
+    -   HOST joins the BBB room
+    -   HOST starts recording in BBB or confirms that it's already recording
+    -   STREAM joins meeting and gives go-ahead
+    -   HOST describes how to ask questions
+    -   [? No questions yet]
+        -   HOST thanks speaker, says nice things about talk, and asks a couple of prepared questions
+    -   [? Q&A needs to be wrapped up]
+        -   HOST writes in Etherpad/IRC or nudges speaker verbally.
+-   [? IRC/pad]
+    -   HOST and STREAM switch to organizer BBB meeting (room S)
+    -   HOST describes Q&A method and shows it on the screen
+    -   While there's buffer time before the next talk, HOST can read out
+        questions and answers
+    -   HOST: It's time for the next talk, but if you want to keep
+        discussing the previous talk, please feel free to continue doing
+        so on IRC or the pad.
+-   [? speaker will answer after the conference]
+    -   HOST and STREAM switch to organizer BBB meeting (room S)
+    -   HOST says the speaker is not available right now, but we'll
+        forward the questions to the speaker and we'll post the speaker's
+        answers on the wiki page. Leave your contact information if you
+        want to be notified, or subscribe to the emacsconf-org mailing
+        list to get the announcement. Please feel free to continue
+        discussing the talk on IRC or the pad.
+-   [Transition to talk](#orgeae9b5c)
 
 
 ## In case of&#x2026;
 
 
+<a id="org1c7436f"></a>
+
 ### Last-minute prerecording submission
 
 -   CHECK will copy it from the FTP upload server to ${protected} and name it appropriately.
--   CHECK will /msg STREAM with the scp command and the mpv command so that STREAM can choose.
+-   CHECK will notify STREAM with the scp command and the mpv command so that STREAM can choose.
 
 -   TODO Shortcut for moving things around
 
 -   TODO Shortcut for notifying STREAM
 
 
-### Speaker has not checked in for live Q&A
+<a id="orgf9944ea"></a>
+
+### Speaker has not checked in
 
 -   Let the previous talk run a little longer for Q&A; end at least in time for the prerec
 -   After the previous Q&A wraps up, play the prerec
@@ -188,6 +247,8 @@ Call this on live0 with the Youtube RTMP streaming key as the first parameter.
     -   Can play next prerec a few minutes early
 
 
+<a id="org03ea047"></a>
+
 ### Speaker does not have a prerec and has not checked in
 
 -   Let the previous talk do live Q&A/demo if ready
@@ -217,14 +278,23 @@ Call this on live0 with the Youtube RTMP streaming key as the first parameter.
 
 ### Alternate stream volunteer wants to stream
 
--   CHECK gives ALTERNATE the BBB room URL
+-   CHECK gives ALTERNATE the BBB room URL for the talk they are interest in
 -   ALTERNATE starts streaming to assigned end point
 -   CHECK confirms stream
--   CHECK updates live:/var/www/html/index.html
+-   CHECK updates ${stream-status}
 -   CHECK notifies STREAM and HOST
     -   After prerec plays:
-        -   HOST: This talk has an extended demo/Q&A. You can go to URL to watch it, and we'll post a recording afterwards.
-        -   HOST sends URL to IRC
+        -   HOST: This talk has an extended demo/Q&A. You can go to ${alternate-url} to watch it, and we'll post a recording afterwards.
+        -   HOST sends ${alternate-url} to IRC: Alternate stream for ${title}: ${alternate-url}
+-   ALTERNATE notifies #emacsconf-org when the stream is done.
+-   CHECK updates ${stream-status} to note that the alternate stream is finished.
+
+
+### Pad malfunction or mess-up
+
+-   PAD resets the pad using <https://etherpad.wikimedia.org/p/emacsconf-2021/timeslider>
+-   [? still not recovered]
+    -   PAD reimports the pad from backup
 
 
 # Before the conference
diff --git a/playbook.org b/playbook.org
index cfac3259..39999417 100644
--- a/playbook.org
+++ b/playbook.org
@@ -5,7 +5,6 @@
 #+end_export
 
 - [[elisp:(progn (org-md-export-to-markdown) (org-babel-tangle))][Export and tangle]]
-- [[elisp:(org-babel-execute-buffer)][Execute buffer]]
 
 * Roles/values
 
@@ -13,13 +12,19 @@
 | CHECK  | check-ins                                                 | sachac  |
 | HOST   | hosting, intros, reading, moving questions/answers around | zaeph   |
 
-| ${protected} | =front:/var/www/media.emacsconf.org/2021/protected/= |
+| ${protected}     | [[/ssh:front:/var/www/media.emacsconf.org/2021/protected/]] |
+| ${stream-status} | [[/ssh:live:/var/www/html/index.html]]             |
 
 * Pre-conference dry run
 - [ ] [[*Start streaming][Start streaming]]
 - [ ] [[*Start low-resolution stream][Start low-resolution stream]]
 - [ ] [[*Start Youtube stream][Start Youtube stream]]
-  
+- [ ] Check in a speaker
+- [ ] Try alternate stream
+- [ ] Try publication process
+- [ ] Review the playbook
+- [ ] Sort out CRDT
+        
 * Thursday or Friday before the conference
 
 - STREAM: Download prerecorded videos from front:/var/www/media.emacsconf.org/2021/protected  
@@ -51,12 +56,15 @@ Call this on live0 with the Youtube RTMP streaming key as the first parameter.
 *** Check in speaker
 
 - Speaker checks in on #emacsconf-org via IRC or via e-mail ~30m before
-- CHECK notes IRC nick: =/conf set <slug> irc <nick>= or =M-g t <slug> C-. p IRC <nick>= 
+- CHECK notes IRC nick for speaker.  =M-g t <slug> C-. p IRC <nick>=  (using Embark and conf-go-to-talk)
 - CHECK confirms Q&A preference: live/IRC/Etherpad, preferred way of getting questions
 - [? unknown] How would you like to handle questions today? Live video, #emacsconf, Etherpad?
-- [? IRC] You can keep an eye on #emacsconf for questions and discussions related to your talk. Feel free to answer, skip answering, tell people that you'll follow up afterwards, etc. We'll also copy questions from the Etherpad so that you can see them in one place. Let us know if you need help!
-- [? Etherpad] The Etherpad is at ${etherpad-url} . Would you like to find the section for your talk and get comfortable? We'll copy questions from IRC over to the pad so that you can see them. Feel free to answer, skip answering, tell people that you'll follow up afterwards, etc. Let us know if you need help!
-- [? live] Our notes say you're thinking of handling questions live. I'll set you up in a BigBlueButton room so that you can get settled in.
+- [? IRC] You can keep an eye on #emacsconf for questions and discussions related to your talk. Feel free to answer, skip answering, tell people that you'll follow up afterwards, etc. We'll also copy questions from the Etherpad so that you can see them in one place. Let us know if you need help or if you want to get set up for live Q&A! (If the volume gets overwhelming, we can copy questions into #emacsconf-questions for you.)
+- [? Etherpad] The Etherpad is at ${etherpad-url} . Would you like to find the section for your talk and get comfortable? We'll copy questions from IRC over to the pad so that you can see them. Feel free to answer, skip answering, tell people that you'll follow up afterwards, etc. Let us know if you need help or if you want to get set up for live Q&A!
+- [? live] Are you thinking of handling questions over a web
+  conference? I'll set you up in a BigBlueButton room so that you can
+  get settled in. Let us know if you want to handle questions by IRC
+  or Etherpad instead.
   - CHECK directs speaker to available room with =/checkin <room> <nick>=
   - Speaker joins talk room
   - CHECK makes speaker presenter and moderator, does last-minute tech check
@@ -64,55 +72,95 @@ Call this on live0 with the Youtube RTMP streaming key as the first parameter.
     - Speaker tries screen sharing and webcam (optional)
     - check screen readability
     - CHECK briefs speaker on process, including:
-      - live Q&A: reading questions themselves (can do in any order, can skip) or asking HOST to read questions to them
+      - live Q&A: reading questions themselves (can do in any order,
+        can skip) or asking HOST to read questions to them
       - encouragement of webcam, although it's optional
-      - how STREAM will join shortly before the prerec ends and then give them the go-ahead
-      - closing any tabs watching the stream as their talk starts (otherwise the audio is confusing)
-    - If the speaker will be live for more than 10 minutes, CHECK collects emergency contact information (in case of technical issues)
+      - how STREAM will join shortly before the prerec ends and then
+        give them the go-ahead
+      - closing any tabs watching the stream as their talk starts
+        (otherwise the audio is confusing)
+    - If the speaker will be giving a live presentation, CHECK
+      collects emergency contact information (in case of technical
+      issues) and /msgs it to HOST
     - Okay to do other things until the prerec ends
-  - CHECK notifies STREAM and HOST with link to the talk room and preferences for Q&A-
-    
-*** Play the prerec
-
-- STREAM switches to MPV scene in OBS and plays the captioned video.
-- CHECK publishes the video to media.emacsconf.org
-- CHECK updates the wiki page to include the video and any other published files.
+  - CHECK notifies STREAM and HOST with link to the talk room and preferences for Q&A-.
 
-*** Q&A
+*** Transition to talk
 
-- [? live]
-  - STREAM joins meeting and gives go-ahead
-  - CHECK starts recording in BBB
-  - CHECK announces on IRC
-  - PAD clears the pad colours
-- [? IRC/pad/afterwards]
-  - TO_DECIDE:
-    - OR:
-      - STREAM joins organizer BBB meeting and HOST describes Q&A method
-      - STREAM describes Q&A method and shows what's going on
-
-*** Transition to next talk
-
-- When it's time to wrap up, HOST writes in Etherpad/IRC or nudges speaker verbally.
 - [? next talk is prerec] 
   - HOST introduces next talk.
   - STREAM switches OBS scene to MPV.
   - STREAM plays prerec in MPV.
 - [? next talk is live]
-  - Host stops recording in this room.
-  - HOST and STREAM switch to the other BBB room.
-  - Host starts recording in the other room.
+  - HOST and STREAM switch to the talk BBB room.
+  - HOST starts recording or confirms that it's already on.
+  - STREAM gives the go-ahead.
   - HOST introduces next talk.
-    
+- PAD backs up a copy of the pad.
+- PAD clears pad colours.
+- Exception: [[*Speaker does not have a prerec and has not checked in][Speaker does not have a prerec and has not checked in]]
+      
+*** Present talk
+
+- [? prerec]
+  - STREAM and HOST switch to the organizer room in BBB.
+  - STREAM switches to MPV scene in OBS and plays the video (with captions if available).
+    - Exception: [[*Last-minute prerecording submission][Last-minute prerecording submission]]
+  - CHECK notes the time that the presentation started, recalculates schedule, and publishes it.
+  - CHECK publishes the video to media.emacsconf.org
+  - CHECK updates the wiki page to include the video and any other published files.
+- [? live]
+  - Exception: [[*Speaker does not have a prerec and has not checked in][Speaker does not have a prerec and has not checked in]]
+  - HOST joins the BBB room and double-checks that recording is on
+  - STREAM joins the BBB room from the IRC /msg and gives the go-ahead
+  - CHECK notes that this is a live presentation and that the recording will be posted after the conference.
+  - CHECK notes the time that the presentation started, recalculates schedule, and publishes it.
+  - Speaker presents.
+  - [? talk needs to be wrapped up]
+    - HOST nudges speaker verbally.
+
+*** Handle Q&A
+
+Exceptions:
+- [[*Speaker has not checked in][Speaker has not checked in]]
+
+- [? live]
+  - HOST joins the BBB room
+  - HOST starts recording in BBB or confirms that it's already recording
+  - STREAM joins meeting and gives go-ahead
+  - HOST describes how to ask questions
+  - [? No questions yet]
+    - HOST thanks speaker, says nice things about talk, and asks a couple of prepared questions
+  - [? Q&A needs to be wrapped up]
+    - HOST writes in Etherpad/IRC or nudges speaker verbally.
+- [? IRC/pad]
+  - HOST and STREAM switch to organizer BBB meeting (room S)
+  - HOST describes Q&A method and shows it on the screen
+  - While there's buffer time before the next talk, HOST can read out
+    questions and answers
+  - HOST: It's time for the next talk, but if you want to keep
+    discussing the previous talk, please feel free to continue doing
+    so on IRC or the pad.
+- [? speaker will answer after the conference]
+  - HOST and STREAM switch to organizer BBB meeting (room S)
+  - HOST says the speaker is not available right now, but we'll
+    forward the questions to the speaker and we'll post the speaker's
+    answers on the wiki page. Leave your contact information if you
+    want to be notified, or subscribe to the emacsconf-org mailing
+    list to get the announcement. Please feel free to continue
+    discussing the talk on IRC or the pad.
+- [[*Transition to talk][Transition to talk]]
+
 ** In case of...
 
 *** Last-minute prerecording submission
 
 - CHECK will copy it from the FTP upload server to ${protected} and name it appropriately.
-- CHECK will /msg STREAM with the scp command and the mpv command so that STREAM can choose.
+- CHECK will notify STREAM with the scp command and the mpv command so that STREAM can choose.
+ 
 **** TODO Shortcut for moving things around
 **** TODO Shortcut for notifying STREAM
-*** Speaker has not checked in for live Q&A
+*** Speaker has not checked in
 - Let the previous talk run a little longer for Q&A; end at least in time for the prerec
 - After the previous Q&A wraps up, play the prerec
 - [? still not around after prerec finishes]
@@ -137,15 +185,23 @@ Call this on live0 with the Youtube RTMP streaming key as the first parameter.
   accept a prerecording afterwards, then include it on the site and in
   post-conference communication
 *** Alternate stream volunteer wants to stream
-- CHECK gives ALTERNATE the BBB room URL
+- CHECK gives ALTERNATE the BBB room URL for the talk they are interest in
 - ALTERNATE starts streaming to assigned end point
 - CHECK confirms stream
-- CHECK updates live:/var/www/html/index.html
+- CHECK updates ${stream-status}
 - CHECK notifies STREAM and HOST
   - After prerec plays:
-    - HOST: This talk has an extended demo/Q&A. You can go to URL to watch it, and we'll post a recording afterwards.
-    - HOST sends URL to IRC
-     
+    - HOST: This talk has an extended demo/Q&A. You can go to ${alternate-url} to watch it, and we'll post a recording afterwards.
+    - HOST sends ${alternate-url} to IRC: Alternate stream for ${title}: ${alternate-url}
+- ALTERNATE notifies #emacsconf-org when the stream is done.
+- CHECK updates ${stream-status} to note that the alternate stream is finished.
+  
+*** Pad malfunction or mess-up
+
+- PAD resets the pad using https://etherpad.wikimedia.org/p/emacsconf-2021/timeslider
+- [? still not recovered]
+  - PAD reimports the pad from backup
+  
 * Before the conference
 ** Help speakers with tech checks
 - Explain process