Skip to content

Commit

Permalink
Minor updates
Browse files Browse the repository at this point in the history
  • Loading branch information
ffdixon committed Mar 2, 2012
1 parent cd01147 commit f220db6
Showing 1 changed file with 14 additions and 8 deletions.
22 changes: 14 additions & 8 deletions bigbluebutton-config/bin/bbb-conf
Original file line number Diff line number Diff line change
Expand Up @@ -355,19 +355,22 @@ check_source() {
mkdir -p $HOME/dev
if [ ! -d $1 ]; then
echo
echo "# Error: Could not find $1."
echo "# You need to clone the BigBlueButton source from GitHub in your"
echo "# Error: Could not find $1"
echo "#"
echo "# You need to clone the BigBlueButton source from GitHub into"
echo "#"
echo "# $HOME/dev"
echo "#"
echo "# directory. After cloning you should have the folder"
echo "# After cloning you should have the folder"
echo "#"
echo "# $HOME/dev/bigbluebutton"
echo "#"
echo "# For more information, see:"
echo "# http://code.google.com/p/bigbluebutton/w/edit/08SettingDevEnvironment"
echo
exit 1
else
echo "# Found source at $1"
fi
}

Expand Down Expand Up @@ -585,7 +588,6 @@ fi

if [ $SETUPDEV ]; then
check_root
check_source ~/dev/bigbluebutton

#
# Check for core development tools
Expand Down Expand Up @@ -724,7 +726,7 @@ export ANT_OPTS=\"-Xmx512m -XX:MaxPermSize=512m\"
# Handle request to bbb-web running within Tomcat. This is for
# the BBB-API and Presentation.
location /bigbluebutton {
proxy_pass http://127.0.0.1:8080;
proxy_pass http://127.0.0.1:8888;
proxy_redirect default;
proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for;
Expand All @@ -747,8 +749,8 @@ export ANT_OPTS=\"-Xmx512m -XX:MaxPermSize=512m\"

fi

sudo rm /etc/bigbluebutton/nginx/web.nginx
sudo ln -s /etc/bigbluebutton/nginx/web_dev /etc/bigbluebutton/nginx/web.nginx
#sudo rm /etc/bigbluebutton/nginx/web.nginx
sudo ln -s -f /etc/bigbluebutton/nginx/web_dev /etc/bigbluebutton/nginx/web.nginx

sudo /etc/init.d/nginx restart

Expand Down Expand Up @@ -822,7 +824,11 @@ export ANT_OPTS=\"-Xmx512m -XX:MaxPermSize=512m\"
# cd ${BBBCLIENTHOME}
# ant locales
#
# 2. Build the client
# 2. Modify the source for the client. The source is locatedtat
#
# $BBBCLIENTHOME
#
# 3. Build the client
#
# cd ${BBBCLIENTHOME}
# ant
Expand Down

0 comments on commit f220db6

Please sign in to comment.