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

Added --setsecret and --secret

Browse Source
This commit is contained in:
Fred Dixon 2013-06-15 02:28:18 -07:00
parent 37107430b7
commit 4854934faf
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,7 +45,6 @@
# 2012-02-22 FFD Updates to development environment # 2012-02-22 FFD Updates to development environment
# 2012-04-27 FFD Added sum of version numbers in --check # 2012-04-27 FFD Added sum of version numbers in --check
# 2013-02-03 FFD Updated for changes to parameters for 0.81 in bigbluebutton-sip.properties # 2013-02-03 FFD Updated for changes to parameters for 0.81 in bigbluebutton-sip.properties
# 2013-06-15 FFD Added --setsecret
#set -x #set -x
#set -e #set -e
@ -174,13 +173,13 @@ usage() {
echo "Configuration:" echo "Configuration:"
echo " --version Display BigBlueButton version (packages)" echo " --version Display BigBlueButton version (packages)"
echo " --setip <host> Set IP/hostname for BigBlueButton" echo " --setip <host> Set IP/hostname for BigBlueButton"
echo " --setsalt <salt> Change the security salt in bigbluebutton.properties" echo " --setsecret <secret> Change the shared secret in bigbluebutton.properties"
echo echo
echo "Monitoring:" echo "Monitoring:"
echo " --check Check configuration files and processes for problems" echo " --check Check configuration files and processes for problems"
echo " --debug Scan the log files for error messages" echo " --debug Scan the log files for error messages"
echo " --watch Scan the log files for error messages every 2 seconds" echo " --watch Scan the log files for error messages every 2 seconds"
echo " --salt View the URL and salt (shared secret) for the server" echo " --secret View the URL and shared secret for the server"
echo " --lti View the URL and secret for LTI (if installed)" echo " --lti View the URL and secret for LTI (if installed)"
echo echo
echo "Administration:" echo "Administration:"
@ -494,6 +493,21 @@ while [ $# -gt 0 ]; do
continue continue
fi fi
if [ "$1" = "--secret" -o "$1" = "-secret" -o "$1" = "--setsecret" ]; then
SALT="${2}"
if [ -z "$SALT" ]; then
BBB_WEB=$(cat ${SERVLET_DIR}/bigbluebutton/WEB-INF/classes/bigbluebutton.properties | sed -n '/^bigbluebutton.web.serverURL/{s/.*\///;p}')
SALT=$(cat ${SERVLET_DIR}/bigbluebutton/WEB-INF/classes/bigbluebutton.properties | grep securitySalt | cut -d= -f2);
echo
echo " URL: http://$BBB_WEB/bigbluebutton/"
echo " Secret: $SALT"
echo
exit 0
fi
shift; shift
continue
fi
if [ "$1" = "--lti" -o "$1" = "-lti" ]; then if [ "$1" = "--lti" -o "$1" = "-lti" ]; then
if [ -z "$SALT" ]; then if [ -z "$SALT" ]; then
if [ -f ${SERVLET_DIR}/lti/WEB-INF/classes/lti.properties ]; then if [ -f ${SERVLET_DIR}/lti/WEB-INF/classes/lti.properties ]; then
@ -541,7 +555,7 @@ fi
if [ $SALT ]; then if [ $SALT ]; then
need_root need_root
change_var_salt ${SERVLET_DIR}/bigbluebutton/WEB-INF/classes/bigbluebutton.properties securitySalt $SALT change_var_salt ${SERVLET_DIR}/bigbluebutton/WEB-INF/classes/bigbluebutton.properties securitySalt $SALT
echo "Changed BigBlueButton's security salt to $SALT" echo "Changed BigBlueButton's shared secret to $SALT"
echo echo
fi fi