Updated bbb-conf to detect if LTI package (bbb-lti) is installed and output configuration values with 'bbb-conf --lti'
This commit is contained in:
parent
be2ee5cf6b
commit
f93c605149
@ -178,6 +178,7 @@ usage() {
|
|||||||
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 " --salt View the URL and salt (shared secret) for the server"
|
||||||
|
echo " --lti View the URL and secret for LTI (if installed)"
|
||||||
echo
|
echo
|
||||||
echo "Administration:"
|
echo "Administration:"
|
||||||
echo " --restart Restart BigBueButton"
|
echo " --restart Restart BigBueButton"
|
||||||
@ -523,6 +524,26 @@ while [ $# -gt 0 ]; do
|
|||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ "$1" = "--lti" -o "$1" = "-lti" ]; then
|
||||||
|
if [ -z "$SALT" ]; then
|
||||||
|
if [ -f ${SERVLET_DIR}/lti/WEB-INF/classes/lti.properties ]; then
|
||||||
|
LTI_URL=$(cat ${SERVLET_DIR}/lti/WEB-INF/classes/lti.properties | sed -n '/^ltiEndPoint/{s/^.*=//;p}')
|
||||||
|
CUSTOMER=$(cat ${SERVLET_DIR}/lti/WEB-INF/classes/lti.properties | sed -n '/^ltiConsumer/{s/^.*=//;s/:.*//p}')
|
||||||
|
SECRET=$(cat ${SERVLET_DIR}/lti/WEB-INF/classes/lti.properties | sed -n '/^ltiConsumer/{s/^[^:]*://;p}')
|
||||||
|
echo
|
||||||
|
echo " URL: $LTI_URL"
|
||||||
|
echo " Customer: $CUSTOMER"
|
||||||
|
echo " Secret: $SECRET"
|
||||||
|
echo
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
shift; shift
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
usage
|
usage
|
||||||
exit 1
|
exit 1
|
||||||
done
|
done
|
||||||
@ -1389,6 +1410,16 @@ check_state() {
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ -d ${SERVLET_DIR}/lti]; then
|
||||||
|
if test ${SERVLET_DIR}/lti.war -nt ${SERVLET_DIR}/lti; then
|
||||||
|
echo "# Error: The updated lti.war did not deploy. To manually deploy:"
|
||||||
|
echo "#"
|
||||||
|
echo "# sudo touch ${SERVLET_DIR}/lti.war"
|
||||||
|
echo "#"
|
||||||
|
echo
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
if [ -d ${SERVLET_DIR}/demo ]; then
|
if [ -d ${SERVLET_DIR}/demo ]; then
|
||||||
if test ${SERVLET_DIR}/demo.war -nt ${SERVLET_DIR}/demo; then
|
if test ${SERVLET_DIR}/demo.war -nt ${SERVLET_DIR}/demo; then
|
||||||
echo "# Error: The updated demo.war did not deploy. To manually deploy:"
|
echo "# Error: The updated demo.war did not deploy. To manually deploy:"
|
||||||
|
Loading…
Reference in New Issue
Block a user