From 8d3464150c28dc8d0f09f1e0d3fafd2a75ef2e32 Mon Sep 17 00:00:00 2001 From: Fred Dixon Date: Thu, 1 Nov 2018 06:55:38 -0500 Subject: [PATCH] Fix #11 --- setup.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/setup.sh b/setup.sh index ffda0dd..06a706e 100755 --- a/setup.sh +++ b/setup.sh @@ -206,7 +206,13 @@ HERE # Ensure bbb-apps-akka has the latest shared secret from bbb-web -SECRET=$(cat /var/lib/tomcat7/webapps/bigbluebutton/WEB-INF/classes/bigbluebutton.properties | grep -v '#' | grep securitySalt | cut -d= -f2); +if [ -z "$SECRET" ]; then + SECRET=$(cat /var/lib/tomcat7/webapps/bigbluebutton/WEB-INF/classes/bigbluebutton.properties | grep -v '#' | grep securitySalt | cut -d= -f2); +else + change_var_value /var/lib/tomcat7/webapps/bigbluebutton/WEB-INF/classes/bigbluebutton.properties securitySalt $SECRET + sed -i "s/String salt = .*/String salt = \"$SECRET\";/g" /var/lib/tomcat7/webapps/demo/bbb_api_conf.jsp +fi + sed -i "s/sharedSecret[ ]*=[ ]*\"[^\"]*\"/sharedSecret=\"$SECRET\"/g" \ /usr/share/bbb-apps-akka/conf/application.conf @@ -255,9 +261,7 @@ To interactively create API calls, here's a link to configure APIMate HERE -if [ -f /usr/bin/updatedb ]; then - updatedb -fi +updatedb exec /usr/bin/supervisord > /var/log/supervisord.log