From 0ea67800286f497baefbd53e833cc1b80638f1ed Mon Sep 17 00:00:00 2001
From: Fred Dixon <ffdixon@gmail.com>
Date: Sun, 17 Nov 2019 13:01:10 -0600
Subject: [PATCH] Updates to detect 18.04

---
 bigbluebutton-config/bin/bbb-conf | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bigbluebutton-config/bin/bbb-conf b/bigbluebutton-config/bin/bbb-conf
index da2b5adc94..9ace627c14 100755
--- a/bigbluebutton-config/bin/bbb-conf
+++ b/bigbluebutton-config/bin/bbb-conf
@@ -101,7 +101,12 @@ if [ -f /etc/centos-release ]; then
     REDIS_SERVICE=redis.service
 else
     . /etc/lsb-release    # Get value for DISTRIB_ID
-    TOMCAT_USER=tomcat7
+    if [ "$DISTRIB_CODENAME" == "bionic" ]; then
+      TOMCAT_USER=tomcat8
+    fi
+    if [ "$DISTRIB_CODENAME" == "xenial" ]; then
+      TOMCAT_USER=tomcat7
+    fi
     TOMCAT_DIR=/var/lib/$TOMCAT_USER
     SERVLET_LOGS=$TOMCAT_DIR/logs
     REDIS_SERVICE=redis-server