diff --git a/build/packages-template/bbb-html5/after-install.sh b/build/packages-template/bbb-html5/after-install.sh index b8316ef0bf..293dab9f5a 100644 --- a/build/packages-template/bbb-html5/after-install.sh +++ b/build/packages-template/bbb-html5/after-install.sh @@ -84,7 +84,7 @@ fi source /etc/lsb-release -if [ "$DISTRIB_RELEASE" == "18.04" ]; then +if [ "$DISTRIB_CODENAME" == "bionic" ]; then node_version="14.18.1" if [[ ! -d /usr/share/node-v${node_version}-linux-x64 ]]; then cd /usr/share diff --git a/build/packages-template/bbb-html5/bionic/bbb-html5-backend@.service b/build/packages-template/bbb-html5/bbb-html5-backend@.service similarity index 100% rename from build/packages-template/bbb-html5/bionic/bbb-html5-backend@.service rename to build/packages-template/bbb-html5/bbb-html5-backend@.service diff --git a/build/packages-template/bbb-html5/bionic/bbb-html5-frontend@.service b/build/packages-template/bbb-html5/bbb-html5-frontend@.service similarity index 100% rename from build/packages-template/bbb-html5/bionic/bbb-html5-frontend@.service rename to build/packages-template/bbb-html5/bbb-html5-frontend@.service diff --git a/build/packages-template/bbb-html5/bionic/bbb-html5-loadbalancer.conf b/build/packages-template/bbb-html5/bbb-html5-loadbalancer.conf similarity index 100% rename from build/packages-template/bbb-html5/bionic/bbb-html5-loadbalancer.conf rename to build/packages-template/bbb-html5/bbb-html5-loadbalancer.conf diff --git a/build/packages-template/bbb-html5/bionic/bbb-html5-with-roles.conf b/build/packages-template/bbb-html5/bbb-html5-with-roles.conf similarity index 100% rename from build/packages-template/bbb-html5/bionic/bbb-html5-with-roles.conf rename to build/packages-template/bbb-html5/bbb-html5-with-roles.conf diff --git a/build/packages-template/bbb-html5/bionic/bbb-html5.conf b/build/packages-template/bbb-html5/bbb-html5.conf similarity index 100% rename from build/packages-template/bbb-html5/bionic/bbb-html5.conf rename to build/packages-template/bbb-html5/bbb-html5.conf diff --git a/build/packages-template/bbb-html5/bionic/bbb-html5.nginx b/build/packages-template/bbb-html5/bbb-html5.nginx similarity index 100% rename from build/packages-template/bbb-html5/bionic/bbb-html5.nginx rename to build/packages-template/bbb-html5/bbb-html5.nginx diff --git a/build/packages-template/bbb-html5/bionic/bbb-html5.service b/build/packages-template/bbb-html5/bbb-html5.service similarity index 100% rename from build/packages-template/bbb-html5/bionic/bbb-html5.service rename to build/packages-template/bbb-html5/bbb-html5.service diff --git a/build/packages-template/bbb-html5/bionic/bbb-html5-worker@.service b/build/packages-template/bbb-html5/bionic/bbb-html5-worker@.service deleted file mode 100644 index abde3fda33..0000000000 --- a/build/packages-template/bbb-html5/bionic/bbb-html5-worker@.service +++ /dev/null @@ -1,26 +0,0 @@ -[Unit] -Description=BigBlueButton HTML5 service, instance %i -Requires=bbb-html5.service -Before=bbb-html5.service -BindsTo=bbb-html5.service - -[Service] -PermissionsStartOnly=true -#Type=simple -Type=idle -EnvironmentFile=/usr/share/meteor/bundle/bbb-html5.conf -ExecStart=/usr/share/meteor/bundle/systemd_start.sh %i $INSTANCE_MAX -WorkingDirectory=/usr/share/meteor/bundle -StandardOutput=syslog -StandardError=syslog -TimeoutStartSec=10 -RestartSec=10 -User=meteor -Group=meteor -CPUSchedulingPolicy=fifo -Nice=19 - - -[Install] -WantedBy=bbb-html5.service - diff --git a/build/packages-template/bbb-html5/build.sh b/build/packages-template/bbb-html5/build.sh index 537bf643ff..e298ad0811 100755 --- a/build/packages-template/bbb-html5/build.sh +++ b/build/packages-template/bbb-html5/build.sh @@ -21,14 +21,14 @@ if [ -f private/config/settings.yml ]; then fi mkdir -p staging/etc/bigbluebutton/nginx -cp $DISTRO/bbb-html5.nginx staging/etc/bigbluebutton/nginx +cp bbb-html5.nginx staging/etc/bigbluebutton/nginx mkdir -p staging/etc/nginx/conf.d -cp $DISTRO/bbb-html5-loadbalancer.conf staging/etc/nginx/conf.d +cp bbb-html5-loadbalancer.conf staging/etc/nginx/conf.d mkdir -p staging/etc/systemd/system -cp $DISTRO/mongod.service staging/etc/systemd/system +cp mongod.service staging/etc/systemd/system mkdir -p staging/usr/share/meteor @@ -66,28 +66,28 @@ npm i cd - cp -r /tmp/html5-build/bundle staging/usr/share/meteor -cp $DISTRO/systemd_start.sh staging/usr/share/meteor/bundle +cp systemd_start.sh staging/usr/share/meteor/bundle chmod +x staging/usr/share/meteor/bundle/systemd_start.sh -cp $DISTRO/systemd_start_frontend.sh staging/usr/share/meteor/bundle +cp systemd_start_frontend.sh staging/usr/share/meteor/bundle chmod +x staging/usr/share/meteor/bundle/systemd_start_frontend.sh -cp $DISTRO/workers-start.sh staging/usr/share/meteor/bundle +cp workers-start.sh staging/usr/share/meteor/bundle chmod +x staging/usr/share/meteor/bundle/workers-start.sh -cp $DISTRO/bbb-html5-with-roles.conf staging/usr/share/meteor/bundle +cp bbb-html5-with-roles.conf staging/usr/share/meteor/bundle cp mongod_start_pre.sh staging/usr/share/meteor/bundle chmod +x staging/usr/share/meteor/bundle/mongod_start_pre.sh -cp $DISTRO/mongo-ramdisk.conf staging/usr/share/meteor/bundle +cp mongo-ramdisk.conf staging/usr/share/meteor/bundle mkdir -p staging/usr/lib/systemd/system -cp $DISTRO/bbb-html5.service staging/usr/lib/systemd/system +cp bbb-html5.service staging/usr/lib/systemd/system cp disable-transparent-huge-pages.service staging/usr/lib/systemd/system -cp $DISTRO/bbb-html5-backend@.service staging/usr/lib/systemd/system -cp $DISTRO/bbb-html5-frontend@.service staging/usr/lib/systemd/system +cp bbb-html5-backend@.service staging/usr/lib/systemd/system +cp bbb-html5-frontend@.service staging/usr/lib/systemd/system mkdir -p staging/usr/share @@ -102,7 +102,7 @@ if [ -f staging/usr/share/meteor/bundle/programs/web.browser/head.html ]; then sed -i "s/VERSION/$(($BUILD))/" staging/usr/share/meteor/bundle/programs/web.browser/head.html fi -# Compress CSS, Javascript andtensorflow WASM binaries used for virtual backgrounds. Keep the +# Compress CSS, Javascript and tensorflow WASM binaries used for virtual backgrounds. Keep the # uncompressed versions as well so it works with mismatched nginx location blocks find staging/usr/share/meteor/bundle/programs/web.browser -name '*.js' -exec gzip -k -f -9 '{}' \; find staging/usr/share/meteor/bundle/programs/web.browser -name '*.css' -exec gzip -k -f -9 '{}' \; diff --git a/build/packages-template/bbb-html5/bionic/mongo-ramdisk.conf b/build/packages-template/bbb-html5/mongo-ramdisk.conf similarity index 100% rename from build/packages-template/bbb-html5/bionic/mongo-ramdisk.conf rename to build/packages-template/bbb-html5/mongo-ramdisk.conf diff --git a/build/packages-template/bbb-html5/bionic/mongod.service b/build/packages-template/bbb-html5/mongod.service similarity index 100% rename from build/packages-template/bbb-html5/bionic/mongod.service rename to build/packages-template/bbb-html5/mongod.service diff --git a/build/packages-template/bbb-html5/bionic/systemd_start.sh b/build/packages-template/bbb-html5/systemd_start.sh similarity index 100% rename from build/packages-template/bbb-html5/bionic/systemd_start.sh rename to build/packages-template/bbb-html5/systemd_start.sh diff --git a/build/packages-template/bbb-html5/bionic/systemd_start_frontend.sh b/build/packages-template/bbb-html5/systemd_start_frontend.sh similarity index 100% rename from build/packages-template/bbb-html5/bionic/systemd_start_frontend.sh rename to build/packages-template/bbb-html5/systemd_start_frontend.sh diff --git a/build/packages-template/bbb-html5/bionic/workers-start.sh b/build/packages-template/bbb-html5/workers-start.sh similarity index 100% rename from build/packages-template/bbb-html5/bionic/workers-start.sh rename to build/packages-template/bbb-html5/workers-start.sh