Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Specify entire URL prefix to "-r" option #329

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Specify entire URL prefix to "-r" option #329

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c98effb
new usage for -r option: specify entire URL prefix with schema instea…
BrentBaccala Jan 6, 2021
2bd805f
fix typo in bash shell command
BrentBaccala Feb 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions bbb-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ OPTIONS (install BigBlueButton):
-m <link_path> Create a Symbolic link from /var/bigbluebutton to <link_path>

-p <host> Use apt-get proxy at <host>
-r <host> Use alternative apt repository (such as packages-eu.bigbluebutton.org)
-r <host> Use alternative apt repository (such as https://packages-eu.bigbluebutton.org)

-d Skip SSL certificates request (use provided certificates from mounted volume)
-w Install UFW firewall (recommended)
Expand Down Expand Up @@ -107,7 +107,7 @@ HERE

main() {
export DEBIAN_FRONTEND=noninteractive
PACKAGE_REPOSITORY=ubuntu.bigbluebutton.org
PACKAGE_REPOSITORY=https://ubuntu.bigbluebutton.org
LETS_ENCRYPT_OPTIONS="--webroot --non-interactive"
SOURCES_FETCHED=false

Expand All @@ -129,6 +129,10 @@ main() {
;;
r)
PACKAGE_REPOSITORY=$OPTARG
# backwards compatibility with old usage that omitted URL scheme
if echo $PACKAGE_REPOSITORY | grep -v -q '^https?:'; then
PACKAGE_REPOSITORY=https://$PACKAGE_REPOSITORY
fi
;;
e)
EMAIL=$OPTARG
Expand Down Expand Up @@ -529,13 +533,13 @@ need_ppa() {
check_version() {
if ! echo $1 | egrep -q "xenial|bionic"; then err "This script can only install BigBlueButton 2.0 (or later)"; fi
DISTRO=$(echo $1 | sed 's/-.*//g')
if ! wget -qS --spider "https://$PACKAGE_REPOSITORY/$1/dists/bigbluebutton-$DISTRO/Release.gpg" > /dev/null 2>&1; then
if ! wget -qS --spider "$PACKAGE_REPOSITORY/$1/dists/bigbluebutton-$DISTRO/Release.gpg" > /dev/null 2>&1; then
err "Unable to locate packages for $1 at $PACKAGE_REPOSITORY."
fi
check_root
need_pkg apt-transport-https
if ! apt-key list | grep -q "BigBlueButton apt-get"; then
wget https://$PACKAGE_REPOSITORY/repo/bigbluebutton.asc -O- | apt-key add -
wget $PACKAGE_REPOSITORY/repo/bigbluebutton.asc -O- | apt-key add -
fi

# Check if were upgrading from 2.0 (the ownership of /etc/bigbluebutton/nginx/web has changed from bbb-client to bbb-web)
Expand All @@ -549,7 +553,7 @@ check_version() {
fi
fi

echo "deb https://$PACKAGE_REPOSITORY/$VERSION bigbluebutton-$DISTRO main" > /etc/apt/sources.list.d/bigbluebutton.list
echo "deb $PACKAGE_REPOSITORY/$VERSION bigbluebutton-$DISTRO main" > /etc/apt/sources.list.d/bigbluebutton.list
}

check_host() {
Expand Down