Merge pull request #13632 from antobinary/merge-24

build: html5 nodejs version + cleanup

build/packages-template/bbb-html5/after-install.sh

@@ -15,30 +15,12 @@ if [[ $meteor_owner != "root:root" ]] ; then
     chown -R root:root /usr/share/meteor
 fi
 
-if [ -f $SERVLET_DIR/WEB-INF/classes/bigbluebutton.properties ]; then
-  sed -i 's/^svgImagesRequired=.*/svgImagesRequired=true/' $SERVLET_DIR/WEB-INF/classes/bigbluebutton.properties
-  if [ ! -f /.dockerenv ]; then
-    systemctl restart nginx
-  fi
-
-  if cat $SERVLET_DIR/WEB-INF/classes/bigbluebutton.properties | grep bigbluebutton.web.serverURL | grep -q https; then
-    PROTOCOL=https
-    sed -i 's/^ENVIRONMENT_TYPE=.*/ENVIRONMENT_TYPE=production/' /usr/share/meteor/bundle/systemd_start.sh
-  else
-    PROTOCOL=http
-    sed -i 's/^ENVIRONMENT_TYPE=.*/ENVIRONMENT_TYPE=development/' /usr/share/meteor/bundle/systemd_start.sh
-  fi
-
-fi
-
   SOURCE=/tmp/settings.yml
   TARGET=/usr/share/meteor/bundle/programs/server/assets/app/config/settings.yml
 
   if [ -f $SOURCE ]; then
 
     WSURL=$(yq r $SOURCE public.kurento.wsUrl)
-    CHROMEEXTENSIONKEY=$(yq r $SOURCE public.kurento.chromeExtensionKey)
-    CHROMEEXTENSIONLINK=$(yq r $SOURCE public.kurento.chromeExtensionLink)
     ENABLESCREENSHARING=$(yq r $SOURCE public.kurento.enableScreensharing)
     ENABLEVIDEO=$(yq r $SOURCE public.kurento.enableVideo)
 
@@ -46,8 +28,6 @@ fi
     ETHERPAD_URL=$(yq r $SOURCE public.note.url)
 
     yq w -i $TARGET public.kurento.wsUrl               "$WSURL"
-    yq w -i $TARGET public.kurento.chromeExtensionKey  "$CHROMEEXTENSIONKEY"
-    yq w -i $TARGET public.kurento.chromeExtensionLink "$CHROMEEXTENSIONLINK"
     yq w -i $TARGET public.kurento.enableScreensharing "$ENABLESCREENSHARING"
     yq w -i $TARGET public.kurento.enableVideo         "$ENABLEVIDEO"
 
@@ -106,16 +86,9 @@ fi
 
 
 source /etc/lsb-release
-if [ "$DISTRIB_RELEASE" == "16.04" ]; then
-  if [ ! -d /usr/share/node-v8.17.0-linux-x64 ]; then
-    cd /usr/share
-    tar xfz node-v8.17.0-linux-x64.tar.gz
-    chown -R meteor:meteor node-v8.17.0-linux-x64
-  fi
-fi
 
 if [ "$DISTRIB_RELEASE" == "18.04" ]; then
-  node_version="14.17.6"
+  node_version="14.18.1"
   if [[ ! -d /usr/share/node-v${node_version}-linux-x64 ]]; then
     cd /usr/share
     tar xfz "node-v${node_version}-linux-x64.tar.gz"

build/packages-template/bbb-html5/after-remove.sh

@@ -2,14 +2,6 @@
 
 case "$1" in
    remove|failed-upgrade|abort-upgrade|abort-install|disappear|0|1)
-     if [ -f $SERVLET_DIR/WEB-INF/classes/bigbluebutton.properties ]; then
-       sed -i 's/svgImagesRequired=true/svgImagesRequired=false/g' $SERVLET_DIR/WEB-INF/classes/bigbluebutton.properties
-       #if [ ! -f /.dockerenv ]; then
-       #  systemctl restart tomcat7
-       #elif [ which supervisorctl > /dev/null ]; then
-       #  supervisorctl restart tomcat7
-       #fi
-     fi
 
    if [ -L /etc/nginx/sites-enabled/bigbluebutton ]; then
      rm /etc/nginx/sites-enabled/bigbluebutton

build/packages-template/bbb-html5/mongo-ramdisk.conf

@@ -1,32 +0,0 @@
-# mongod.conf
-
-# for documentation of all options, see:
-#   http://docs.mongodb.org/manual/reference/configuration-options/
-
-storage:
-  dbPath: /mnt/mongo-ramdisk
-  journal:
-   enabled: false
-  wiredTiger:
-    engineConfig:
-         cacheSizeGB: 0
-         journalCompressor: none 
-         directoryForIndexes: true
-    collectionConfig:
-         blockCompressor: none 
-    indexConfig:
-         prefixCompression: false
-
-systemLog:
-  destination: file
-  logAppend: true
-  path: /var/log/mongodb/mongod.log
-
-net:
-  port: 27017
-  bindIp: 127.0.1.1
-
-
-replication:
-  replSetName: rs0
-