updated live2.fsf.org urls -> live.fsf.org

diff --git a/2018/assets/js/stream.js b/2018/assets/js/stream.js
index 284763dcf69e07500731899ab91cbf020982b797..35f86f35f43faf3e7b7dcb4f35095081245b1303 100644 (file)
--- a/2018/assets/js/stream.js
+++ b/2018/assets/js/stream.js
@@ -46,9 +46,9 @@ if (!Array.prototype.find) {
 
 var app = {};
 
-app.icecastUrl = "http://live2.fsf.org";
+app.icecastUrl = "http://live.fsf.org";
 
-app.icecastApiUrl = "//live2.fsf.org";
+app.icecastApiUrl = "//live.fsf.org";
 
 app.scheduleEvery = function(duration, thunk) {
   thunk();

diff --git a/2018/live/room101.html b/2018/live/room101.html
index 7bdd276f0161cd54ffe4269c9f6a0a27689d124b..a9bb395037877358e2c67e6a696dea0c921bd70a 100755 (executable)
--- a/2018/live/room101.html
+++ b/2018/live/room101.html
@@ -14,7 +14,7 @@
   <div class="col-sm-8"> <!-- start of main content -->
     <div class="thumbnail"> <!-- start Live Player -->
       <video class="lp-video" controls>
-       <source src="http://live2.fsf.org/slides-101.webm" type="video/webm" />
+       <source src="http://live.fsf.org/slides-101.webm" type="video/webm" />
        <p><em>Your browser does not support the video
          tag, <a href="http://live.fsf.org/room101.ogv">
          [ please download ]</a> the video instead.</em></p>

diff --git a/2018/live/room123.html b/2018/live/room123.html
index ff2bbef3d67ec17fbf89352a87510083a53d6c7d..ac7e9fe3d13c2a0cef6ba1dd4f6d52eafd622c13 100755 (executable)
--- a/2018/live/room123.html
+++ b/2018/live/room123.html
@@ -14,7 +14,7 @@
   <div class="col-sm-8"> <!-- start of main content -->
     <div class="thumbnail"> <!-- start Live Player -->
       <video class="lp-video" controls>
-       <source src="http://live2.fsf.org/slides-123.webm" type="video/webm" />
+       <source src="http://live.fsf.org/slides-123.webm" type="video/webm" />
        <p><em>Your browser does not support the video
          tag, <a href="http://live.fsf.org/room123.ogv">
          [ please download ]</a> the video instead.</em></p>