summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--2022/organizers-notebook/index.org13
-rw-r--r--2022/watch/dev.md4
-rw-r--r--2022/watch/gen.md5
-rw-r--r--2022/watch/info.md4
4 files changed, 17 insertions, 9 deletions
diff --git a/2022/organizers-notebook/index.org b/2022/organizers-notebook/index.org
index 490f41d0..86057caa 100644
--- a/2022/organizers-notebook/index.org
+++ b/2022/organizers-notebook/index.org
@@ -1,4 +1,4 @@
-#+todo: TODO(t) INPROGRESS(i) WAITING(w) STANDBY(s) BLOCKED(b) | DONE(x) CANCELLED(c)
+#+todo: TODO(t) STARTED INPROGRESS(i) WAITING(w) STANDBY(s) BLOCKED(b) | DONE(x) CANCELLED(c)
#+OPTIONS: h:6 toc:nil num:nil ':t
#+PROPERTY: header-args :results silent :exports code :tangle yes
#+EXPORT_FILE_NAME: ../organizers-notebook.md
@@ -402,7 +402,16 @@ in prod or docker container
*** TODO local icecast forwarder
*** TODO restreamers on live0
-*** TODO icecast on live0
+*** STARTED icecast on live0
+:PROPERTIES:
+:Effort: 1:00
+:END:
+:LOGBOOK:
+CLOCK: [2022-10-20 Thu 12:36]
+:END:
+
+(find-file "/ssh:live|sudo::/etc/icecast2/icecast.xml")
+**** TODO Set up watch/gen/480p
*** TODO publishing environment
*** DONE Get ansible to run against a clean docker
CLOSED: [2022-10-11 Tue 12:20]
diff --git a/2022/watch/dev.md b/2022/watch/dev.md
index 17c08bbd..6905a3f1 100644
--- a/2022/watch/dev.md
+++ b/2022/watch/dev.md
@@ -7,8 +7,8 @@
<a href="#watch">Watch</a> - <a href="#chat">Chat</a> - <a href="#sched">View schedule</a> -
Streams: <a href="/2022/watch/gen/">General</a> - **Development**
-<video controls><source src="https://live0.emacsconf.org/dev.webm" type="video/webm" /></video>
-Alternatively, load <https://live0.emacsconf.org/dev.webm> or <https://live0.emacsconf.org/dev-480p.webm> (low-res) in a streaming media player such as MPV.
+<video controls><source src="https://live0.emacsconf.org/emacsconf/dev.webm" type="video/webm" /></video>
+Alternatively, load <https://live0.emacsconf.org/emacsconf/dev.webm> or <https://live0.emacsconf.org/emacsconf/dev-480p.webm> (low-res) in a streaming media player such as MPV.
<a name="chat"></a>
<a href="#watch">Watch</a> - <a href="#chat">Chat</a> - <a href="#sched">View schedule</a> -
diff --git a/2022/watch/gen.md b/2022/watch/gen.md
index 0a44107c..b043abbe 100644
--- a/2022/watch/gen.md
+++ b/2022/watch/gen.md
@@ -7,8 +7,8 @@
<a href="#watch">Watch</a> - <a href="#chat">Chat</a> - <a href="#sched">View schedule</a> -
Streams: **General** - <a href="/2022/watch/dev/">Development</a>
-<video controls><source src="https://live0.emacsconf.org/gen.webm" type="video/webm" /></video>
-Alternatively, load <https://live0.emacsconf.org/gen.webm> or <https://live0.emacsconf.org/gen-480p.webm> (low-res) in a streaming media player such as MPV.
+<video controls><source src="https://live0.emacsconf.org/emacsconf/gen.webm" type="video/webm" /></video>
+Alternatively, load <https://live0.emacsconf.org/emacsconf/gen.webm> or <https://live0.emacsconf.org/emacsconf/gen-480p.webm> (low-res) in a streaming media player such as MPV.
<a name="chat"></a>
<a href="#watch">Watch</a> - <a href="#chat">Chat</a> - <a href="#sched">View schedule</a> -
@@ -43,7 +43,6 @@ Streams: **General** - <a href="/2022/watch/dev/">Development</a>
[[!template id=sched title="This Year in Org" url="/2022/talks/orgyear" speakers="Timothy" q-and-a="IRC" track="General" slug="orgyear" time="10" startutc="2022-12-04T14:35:00+0000" endutc="2022-12-04T14:45:00+0000" start="9:35" end="9:45"]]
[[!template id=sched title="Build a Zettelkasten with the Hyperbole Rolodex" url="/2022/talks/rolodex" speakers="Ramin Honary" q-and-a="IRC" track="General" slug="rolodex" time="20" startutc="2022-12-04T15:00:00+0000" endutc="2022-12-04T15:20:00+0000" start="10:00" end="10:20"]]
[[!template id=sched title="Linking headings with org-super-links (poor-man's Zettelkasten)" url="/2022/talks/orgsuperlinks" speakers="Karl Voit" q-and-a="live" track="General" slug="orgsuperlinks" time="10" startutc="2022-12-04T15:40:00+0000" endutc="2022-12-04T15:50:00+0000" start="10:40" end="10:50"]]
-[[!template id=sched title="Linking personal info with Hyperbole implicit buttons" url="/2022/talks/buttons" speakers="Mats Lidell" q-and-a="live" track="General" slug="buttons" time="10" startutc="2022-12-04T16:10:00+0000" endutc="2022-12-04T16:20:00+0000" start="11:10" end="11:20"]]
[[!template id=sched title="Powerful productivity with Hyperbole and Org Mode" url="/2022/talks/hyperorg" speakers="Robert Weiner" q-and-a="live" track="General" slug="hyperorg" time="30" startutc="2022-12-04T18:00:00+0000" endutc="2022-12-04T18:30:00+0000" start="1:00" end="1:30"]]
[[!template id=sched title="Org workflows for developers" url="/2022/talks/workflows" speakers="George Mauer" q-and-a="live" track="General" slug="workflows" time="20" startutc="2022-12-04T18:50:00+0000" endutc="2022-12-04T19:10:00+0000" start="1:50" end="2:10"]]
[[!template id=sched title="GRAIL---A Generalized Representation and Aggregation of Information Layers" url="/2022/talks/grail" speakers="Sameer Pradhan" q-and-a="live" track="General" slug="grail" time="20" startutc="2022-12-04T19:30:00+0000" endutc="2022-12-04T19:50:00+0000" start="2:30" end="2:50"]]
diff --git a/2022/watch/info.md b/2022/watch/info.md
index 4c902b9d..22b36009 100644
--- a/2022/watch/info.md
+++ b/2022/watch/info.md
@@ -3,7 +3,7 @@
# Tracks
<table width="100%"><tr><th>Watch page</th><th>IRC channel (libera.chat)</th><th>Alternative for streaming player</th><th>Low res</th></tr>
-<tr><td><a href="/2022/watch/gen">General</a></td><td><a href="https://chat.emacsconf.org/?join=emacsconf,emacsconf-gen">#emacsconf-gen</a></td><td><a href="https://live0.emacsconf.org/gen.webm">https://live0.emacsconf.org/gen.webm</a></td><td><a href="https://live0.emacsconf.org/gen-480p.webm">gen-480p.webm</a></tr>
-<tr><td><a href="/2022/watch/dev">Development</a></td><td><a href="https://chat.emacsconf.org/?join=emacsconf,emacsconf-dev">#emacsconf-dev</a></td><td><a href="https://live0.emacsconf.org/dev.webm">https://live0.emacsconf.org/dev.webm</a></td><td><a href="https://live0.emacsconf.org/dev-480p.webm">dev-480p.webm</a></tr></table>
+<tr><td><a href="/2022/watch/gen">General</a></td><td><a href="https://chat.emacsconf.org/?join=emacsconf,emacsconf-gen">#emacsconf-gen</a></td><td><a href="https://live0.emacsconf.org/emacsconf/gen.webm">https://live0.emacsconf.org/emacsconf/gen.webm</a></td><td><a href="https://live0.emacsconf.org/emacsconf/gen-480p.webm">gen-480p.webm</a></tr>
+<tr><td><a href="/2022/watch/dev">Development</a></td><td><a href="https://chat.emacsconf.org/?join=emacsconf,emacsconf-dev">#emacsconf-dev</a></td><td><a href="https://live0.emacsconf.org/emacsconf/dev.webm">https://live0.emacsconf.org/emacsconf/dev.webm</a></td><td><a href="https://live0.emacsconf.org/emacsconf/dev-480p.webm">dev-480p.webm</a></tr></table>
[[!inline pages="internal(2022/schedule-image)" raw="yes"]] \ No newline at end of file