From 74693999b7e1e956256f624cffa1c12f89f46e15 Mon Sep 17 00:00:00 2001
From: Fred Dixon <ffdixon@gmail.com>
Date: Thu, 14 Jul 2011 10:10:44 -0700
Subject: [PATCH] Changed links on index.html to point to /demo/demo1.jsp
 instead of /bigbluebutton/demo/demo1.jsp

---
 bigbluebutton-config/bin/bbb-conf   | 11 ++++++++++-
 bigbluebutton-config/web/index.html |  4 ++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/bigbluebutton-config/bin/bbb-conf b/bigbluebutton-config/bin/bbb-conf
index 449bbd0eab..64416fde23 100755
--- a/bigbluebutton-config/bin/bbb-conf
+++ b/bigbluebutton-config/bin/bbb-conf
@@ -1244,6 +1244,15 @@ check_state() {
 		fi
 	fi
 
+        PLAYBACK_IP=$(cat /usr/local/bigbluebutton/core/scripts/simple.yml  | sed -n '/playback_host/{s/.*:[ ]*//;s/;//;p}')
+        if [ $PLAYBACK_IP != $IP ]; then
+                        echo
+                        echo "# The IP address ($PLAYBACK_IP) set for playback_host in"
+                        echo "#    /usr/local/bigbluebutton/core/scripts/simple.yml"
+                        echo "# does not match the local IP address ($IP)."
+                        echo
+                fi
+
 	exit 0
 }
 
@@ -1320,7 +1329,7 @@ if [ $CHECK ]; then
 		PLAYBACK_IP=$(cat /usr/local/bigbluebutton/core/scripts/simple.yml  | sed -n '/playback_host/{s/.*:[ ]*//;s/;//;p}')
 		echo
 		echo "/usr/local/bigbluebutton/core/scripts/simple.yml (record and playback)"
-		echo "                     playback host: $NGINX_IP"
+		echo "                     playback host: $PLAYBACK_IP"
 	fi
 
 
diff --git a/bigbluebutton-config/web/index.html b/bigbluebutton-config/web/index.html
index de23f25028..94db8b5a1f 100755
--- a/bigbluebutton-config/web/index.html
+++ b/bigbluebutton-config/web/index.html
@@ -59,7 +59,7 @@
         <div id="join">
             <h2>Join a Demo Meeting</h2>
             <p/>&nbsp;<p/>
-            <FORM NAME="form1" METHOD="GET" onSubmit="return checkform(this);" action="/bigbluebutton/demo/demo1.jsp">
+            <FORM NAME="form1" METHOD="GET" onSubmit="return checkform(this);" action="/demo/demo1.jsp">
 
                         <p class="content">Enter your name:</p>
                         <input type="text" id="username"  name="username" size="29" /><input type="submit" value="Join"/> <br />
@@ -79,7 +79,7 @@
              <h2>API Examples</h2>
              <p class="content">See examples of how you can integrate BigBlueButton into your applications.</p>
              <img src="images/arrow.png" width="15" height="17" border="0" />
-             <div style="margin-top:-17px; margin-left:20px;"><a href="/bigbluebutton/demo/demo1.jsp">View API Examples</a></div>
+             <div style="margin-top:-17px; margin-left:20px;"><a href="/demo/demo1.jsp">View API Examples</a></div>
         </div>
 
     </div>