Revert "Revert "change live2.fsf.org to live.fsf.org""

This reverts commit d7001c483811a8ecfda95a97251c1ef21486dff1.

diff --git a/2017/assets/js/stream.js b/2017/assets/js/stream.js
index 25dd5caee99bdc924399bc4bc3d875ae14178ea3..a43dd32057843882f29db989290828f27bb87771 100644 (file)
--- a/2017/assets/js/stream.js
+++ b/2017/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/2017/live/index.html b/2017/live/index.html
index 6cdd4a58e23f52591858b02f8769b7ae6fac79af..49e5d54a56f7bd8d0074cad6b03db01181a0a302 100755 (executable)
--- a/2017/live/index.html
+++ b/2017/live/index.html
@@ -14,8 +14,8 @@
       <p>
         Our conference streaming web interface requires JavaScript, but
         all of our streams are readily available on
-        <a href="http://live2.fsf.org">
-          live2.fsf.org
+        <a href="http://live.fsf.org">
+          live.fsf.org
         </a>
         and can be played with the video client of your
         choice, such as VLC or mplayer.
@@ -23,26 +23,26 @@
       <p>
        You can watch the streams directly by using vlc or some other media players with the following URLs:<br><br>
 
-       https://live2.fsf.org/stream-123.webm <br>
-       https://live2.fsf.org/stream-141.webm <br>
-       https://live2.fsf.org/stream-144.webm <br>
-       https://live2.fsf.org/stream-155.webm <br><br>
+       https://live.fsf.org/stream-123.webm <br>
+       https://live.fsf.org/stream-141.webm <br>
+       https://live.fsf.org/stream-144.webm <br>
+       https://live.fsf.org/stream-155.webm <br><br>
 
-       https://live2.fsf.org/slides-123.webm <br>
-       https://live2.fsf.org/slides-141.webm <br>
-       https://live2.fsf.org/slides-144.webm <br>
-       https://live2.fsf.org/slides-155.webm <br><br>
+       https://live.fsf.org/slides-123.webm <br>
+       https://live.fsf.org/slides-141.webm <br>
+       https://live.fsf.org/slides-144.webm <br>
+       https://live.fsf.org/slides-155.webm <br><br>
 
-       https://live2.fsf.org/stream-123-480p.webm <br>
-       https://live2.fsf.org/stream-141-480p.webm <br>
-       https://live2.fsf.org/stream-144-480p.webm <br>
-       https://live2.fsf.org/stream-155-480p.webm <br><br>
+       https://live.fsf.org/stream-123-480p.webm <br>
+       https://live.fsf.org/stream-141-480p.webm <br>
+       https://live.fsf.org/stream-144-480p.webm <br>
+       https://live.fsf.org/stream-155-480p.webm <br><br>
 
        or using something like this on a terminal:
 <pre>
-vlc https://live2.fsf.org/stream-123.webm
-mpv https://live2.fsf.org/stream-141.webm
-ffplay https://live2.fsf.org/stream-155.webm
+vlc https://live.fsf.org/stream-123.webm
+mpv https://live.fsf.org/stream-141.webm
+ffplay https://live.fsf.org/stream-155.webm
 </pre>
       </p>
     </noscript>