Merge branch 'main' into MySQL

templates/content-index-announcement.tpl.html

@@ -1,17 +1,16 @@
 <!--% PROCESS 'shared-utils.tpl.html' %-->
 <hr>
 <h2><u>The Eleventh Annual 26 Hour New Years Eve Show</u></h2>
-<!--
 
 <p>
-<img src="livestream.png" /><br />
+<img src="<!--% absolute_path(baseurl) %-->images/livestream.png" /><br />
 <audio controls autoplay>
-    <source src="http://shownotes.ooguy.com:8000/stream" type="audio/mpeg" >
+    <source src="https://stream.lugcast.mywire.org/stream" type="audio/mpeg" >
 </audio> <br />
-<a href="http://shownotes.ooguy.com:8000/stream">http://shownotes.ooguy.com:8000/stream.m3u</a><br />
+<a href="https://stream.lugcast.mywire.org/stream">https://stream.lugcast.mywire.org/stream</a><br />
 <a href="https://hackerpublicradio.org/live">https://hackerpublicradio.org/live</a><br />
 </p>
--->
+
 <h3>Welcome every <a href="https://www.timeanddate.com/counters/multicountdown.html">TimeZone</a>!</h3>
 
 <p><em>If you keep talking, we'll keep recording.</em> </p>
@@ -34,11 +33,11 @@ Channel: <strong>HPR</strong></p>
 
 <p>For those who have never used Mumble before, see this <a href="<!--% absolute_path(baseurl) %-->mumble-howto.html">how-to explaining the setup of the desktop Mumble client</a>, or listen to <a href="<!--% absolute_path(baseurl) %-->eps/hpr3503/index.html">hpr3503 :: Configuring Mumble</a>.</p>
 
-<!--<h3>Add to the Show-notes</h3>
+<h3>Add to the Show-notes</h3>
 
 <p>
 <strong>Please help fill out the show notes</strong><br />
-<a href="http://shownotes.ooguy.com:9001/p/HPR-NYE-2022">http://shownotes.ooguy.com:9001/p/HPR-NYE-2022</a><br />
+<a href="https://shownotes.lugcast.mywire.org/p/hpr-nye-2022">https://shownotes.lugcast.mywire.org/p/hpr-nye-2022</a><br />
 We are using Etherpad for people to share links and info to things they are discussing. The Etherpad will be used for the HPR audio shownotes so please feel free to add to it. The entire event will be broken into 2 to 3 hour segments and made available as HPR episodes.<br/>
 <em>This really, really helps us out to post the show faster !</em>
 </p>
@@ -49,9 +48,9 @@ We are using Etherpad for people to share links and info to things they are disc
 We're going to release the show as a podcast, so it would be great if you could grab a copy as a backup.
 
 <pre>
-while true;do timestamp="$HOSTNAME-$(\date -u +%Y-%m-%d_%H-%M-%SZ_%A)"; echo "Recording ${timestamp}";cvlc "http://shownotes.ooguy.com:8000/stream.m3u" --sout "file/mp3:${timestamp}.mp3" --run-time="3600" vlc://quit;done
+while true;do timestamp="$HOSTNAME-$(\date -u +%Y-%m-%d_%H-%M-%SZ_%A)"; echo "Recording ${timestamp}";cvlc "https://stream.lugcast.mywire.org/stream" --sout "file/mp3:${timestamp}.mp3" --run-time="3600" vlc://quit;done
 </pre>
-</p>-->
+</p>
 
 <!--
 while true;do ffmpeg -i https://hackerpublicradio.org/live -c copy hprnye-$( \date -u +%s )-$( \date -u +%Y%m%dT%H%M%SZ )-${HOSTNAME}.mp3; done
@@ -59,7 +58,6 @@ while true;do ffmpeg -i https://hackerpublicradio.org/live -c copy hprnye-$( \da
 <p>
 The show will be held on the <a href="mumble://chatter.skyehaven.net:64738/Hacker%20Public%20Radio?version=1.2.0">HPR Room on Mumble</a>, so now you can prepare by installing the <a href="https://wiki.mumble.info/wiki/Main_Page">mumble PC Client</a>, or the <a href="https://f-droid.org/packages/se.lublin.mumla">mumla Android Client</a>. The Server we will use is: <strong>chatter.skyehaven.net</strong>, Port: <strong>64738</strong>, Channel: <strong>HPR</strong>
 </p>
--->
 
 <h3>Spread the Word</h3>
 
@@ -69,7 +67,6 @@ The show will be held on the <a href="mumble://chatter.skyehaven.net:64738/Hacke
     <source src="https://hackerpublicradio.org/promote/new-year-show-promo.mp3" type="audio/mpeg" >
 </audio></p>
 
-<!--
 <p>
 If you prefer to just listen to the show and not participate using Mumble, use the link below for the live audio stream using your web browser or favorite audio application such as VLC, or live in your web browser.<br/>
 </p>