BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into send-receive-chat-from-js-api

Browse Source
This commit is contained in:
Richard Alam 2012-10-30 18:24:54 +00:00
commit 647ffdc602
3 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bbb-lti/grails-app/conf/lti.properties
View File

@ -23,7 +23,7 @@
# This URL is where the BBB client is accessible.
bigbluebuttonURL=http://localhost/bigbluebutton
# Salt which is used by 3rd-party apps to authenticate api calls
bigbluebuttonSalt=bbb_secret
bigbluebuttonSalt=bbb_salt
# LTI basic information
#----------------------------------------------------
@ -31,7 +31,7 @@ bigbluebuttonSalt=bbb_secret
ltiEndPoint=http://localhost/lti/tool.xml
# The list of consumers allowed to access this lti service.
# Format: [consumerId:sharedSecret]
ltiConsumers=bbb:bbb_secret
ltiConsumers=bbb:lti_secret
#----------------------------------------------------
# Inject configuration values into BigbluebuttonSrvice beans

21
bigbluebutton-config/bin/bbb-conf
View File

@ -535,6 +535,10 @@ while [ $# -gt 0 ]; do
echo " Customer: $CUSTOMER"
echo " Secret: $SECRET"
echo
ICON_URL=$( echo $LTI_URL | sed 's/tool.xml/images\/favicon.ico/')
echo " Icon URL: $ICON_URL"
echo
echo
exit 0
fi
fi
@ -1559,6 +1563,13 @@ if [ $CHECK ]; then
echo " api url: $API_IP"
fi
if [ -f ${SERVLET_DIR}/lti/WEB-INF/classes/lti.properties ]; then
LTI_URL=$(cat ${SERVLET_DIR}/lti/WEB-INF/classes/lti.properties | sed -n '/^bigbluebuttonURL/{s/.*http:\/\///;s/\/.*//;p}' | tr -d '\015')
echo
echo "${SERVLET_DIR}/lti/WEB-INF/classes/lti.properties (LTI integration)"
echo " api url: $LTI_URL"
fi
if [ $VOICE_CONFERENCE == "bbb-voice-freeswitch.xml" ]; then
CONFERENCING_MODULE="FreeSWITCH"
else
@ -1842,6 +1853,16 @@ if [ -n "$HOST" ]; then
${SERVLET_DIR}/demo/bbb_api_conf.jsp
fi
if [ -f ${SERVLET_DIR}/lti/WEB-INF/classes/lti.properties ]; then
echo "Assigning $HOST for LTI integration in ${SERVLET_DIR}/lti/WEB-INF/classes/lti.properties"
sed -i "s/bigbluebuttonURL=http:\/\/.*/bigbluebuttonURL=http:\/\/$HOST\/bigbluebutton/g" \
${SERVLET_DIR}/lti/WEB-INF/classes/lti.properties
sed -i "s/ltiEndPoint=http:\/\/.*/ltiEndPoint=http:\/\/$HOST\/lti\/tool.xml/g" \
${SERVLET_DIR}/lti/WEB-INF/classes/lti.properties
fi
if [ -f /usr/local/bigbluebutton/core/scripts/bigbluebutton.yml ]; then
echo "Assigning $HOST for record and playback in /usr/local/bigbluebutton/core/scripts/bigbluebutton.yml"
change_yml_value /usr/local/bigbluebutton/core/scripts/bigbluebutton.yml $redis_host playback_host $HOST

1
record-and-playback/presentation/playback/presentation/css/bbb.playback.css
View File

@ -199,5 +199,6 @@ br{
#cursor {
position: relative;
background: red;
z-index: 10;
}