diff --git a/README.install-20.04 b/README.install-20.04 index 1aa8041..5c5c8b3 100644 --- a/README.install-20.04 +++ b/README.install-20.04 @@ -15,25 +15,21 @@ ADMIN_EMAIL="agr@vvn-bda.de" # 1 Pre-installation checks # === +# see: https://docs.bigbluebutton.org/administration/install/#pre-installation-checks # --- -# 1.) Run script bbb-pre-install.sh +# Run script bbb-pre-install.sh # --- -# check that the locale of the server is en_US.UTF-8. +# The script does: # -cat /etc/default/locale +# - installs missing debian packages - -# If you don't see LANG="en_US.UTF-8", enter the following commands to set the local to en_US.UTF-8. +# - checks the locale parameter and sets it to 'en_US.UTF-8' if necessary # -apt-get install -y language-pack-en -update-locale LANG=en_US.UTF-8 - - -# --- -# More checks see: https://docs.bigbluebutton.org/administration/install/#pre-installation-checks -# --- +# - Installs the latest version of Docker if necessary +# +/usr/local/src/bigbluebutton/bbb-pre-install.sh # === @@ -84,42 +80,6 @@ wget -qO- https://raw.githubusercontent.com/bigbluebutton/bbb-install/v2.7.x-rel wget -qO- https://ubuntu.bigbluebutton.org/bbb-install.sh | bash -s -- -v bionic-230 -s $FQDN_HOSTNAME -e $ADMIN_EMAIL -a -w -# You can test your BigBlueButton installation. Open -# -# https://$FQDN_HOSTNAME -# -# enter your name, and click 'Join' to join 'Demo Meeting'. The BigBlueButton client should -# launch in 'Demo Meeting'. - - -# --- -# 3.) Deinstall bbb-demo -# --- - -# Warning: The API demos are installed and accessible from: -# -# https://bbb.oopen.de -# -# and -# -# https://bbb.oopen.de/demo/demo1.jsp -# -# These API demos allow anyone to access your server without authentication -# to create/manage meetings and recordings. They are for testing purposes only. -# If you are running a production system, remove them by running: -# -# apt-get purge bbb-demo -# -apt purge bbb-demo - - -# --- -# 4.) Install Greenlight - Run script bbb-greenlight-install.sh -# --- - -/usr/local/src/bigbluebutton/bbb-greenlight-install.sh - - # -- # Installation finished # -- diff --git a/bbb-pre-install.sh b/bbb-pre-install.sh index 0f5512c..cc5ca42 100755 --- a/bbb-pre-install.sh +++ b/bbb-pre-install.sh @@ -327,7 +327,6 @@ echo "" _error=false : > $log_file -blank_line echononl "Check if needed packages are installed.." for _pkg in $NEEDED_DEBIAN_PACKAGES ; do if aptitude search "$_pkg" | grep " $_pkg " | grep -e "^i" >> "$log_file" 2>&1 ; then @@ -488,8 +487,12 @@ else fi +blank_line + info "The settings in the \033[1etc/default/locale\033[m file are correct." +blank_line + echononl "Set system environment to 'en_US.UTF-8'.." if $(systemctl show-environment | grep -Eq "LANG=\"?en_US.UTF-8\"?") ; then @@ -514,8 +517,6 @@ else fi fi -blank_line - # --- @@ -524,14 +525,14 @@ blank_line echo "" echo -e " \033[1m---\033[m" -echo -e " \033[32m\Install latest version of docker033[m" +echo -e " \033[32mInstall latest version of docker\033[m" echo -e " \033[1m---\033[m" echo "" :> "$log_file" if ! $(grep -Eq "^\s*deb\s+.*https://download.docker.com/linux/ubuntu\s+$DIST_CODENAME\s+stable" /etc/apt/sources.list) \ && ! $(grep -r -Eq "^\s*deb\s+.*https://download.docker.com/linux/ubuntu\s+$DIST_CODENAME\s+stable" /etc/apt/sources.list.d/*) -then +then echononl "Add GPG key for official Docker repository.." curl -fsSL https://download.docker.com/linux/ubuntu/gpg 2> "$log_file" | apt-key add - >> "$log_file" 2>&1