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

Fix apt-keys deprecation,and set a standard for where keys should go #758

Open
wants to merge 3 commits into
base: v3.0.x-release
Choose a base branch
from
Open

Fix apt-keys deprecation,and set a standard for where keys should go #758

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2d86941
Update bbb-install.sh
gordnhoo Oct 24, 2024
ccc3b02
Add the proxy env to docker
gordnhoo Oct 25, 2024
89caec4
snippet code in the wrong place proxy wasn't getting applied
gordnhoo Oct 25, 2024
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
86 changes: 69 additions & 17 deletions bbb-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,17 +278,53 @@ main() {
get_IP "$HOST"

if [ "$DISTRO" == "jammy" ]; then

need_pkg ca-certificates

need_ppa rmescandon-ubuntu-yq-jammy.list ppa:rmescandon/yq CC86BB64 # Edit yaml files with yq
#need_ppa ppa:rmescandon/yq
need_pkg yq
yq --version

#need_ppa libreoffice-ubuntu-ppa-jammy.list ppa:libreoffice/ppa 1378B444 # Latest version of libreoffice
#ppa:rmescandon/yq installation
if [ -f /etc/apt/sources.list.d/rmescandon-ubuntu-yq-jammy.list ] && grep -q 18 /etc/apt/sources.list.d/rmescandon-ubuntu-yq-jammy.list; then
sudo rm -r /etc/apt/sources.list.d/rmescandon-ubuntu-yq-jammy.list
fi
if [ ! -f /etc/apt/sources.list.d/rmescandon-ubuntu-yq-jammy.list ]; then
if [ -f /etc/apt/keyrings/rmescandon-ubuntu-yq.gpg ]; then
rm -r /etc/apt/keyrings/rmescandon-ubuntu-yq.gpg
fi
curl -fsSL "https://ppa.launchpadcontent.net/rmescandon/yq/ubuntu/dists/jammy/Release.gpg" -o /etc/apt/keyrings/rmescandon-ubuntu-yq-release.gpg
curl -sL 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x6657DBE0CC86BB64' | gpg --dearmor > /etc/apt/keyrings/rmescandon-ubuntu-yq.gpg
rm -r /etc/apt/keyrings/rmescandon-ubuntu-yq-release.gpg
echo "deb [signed-by=/etc/apt/keyrings/rmescandon-ubuntu-yq.gpg] https://ppa.launchpadcontent.net/rmescandon/yq/ubuntu/ jammy main" > /etc/apt/sources.list.d/rmescandon-ubuntu-yq-jammy.list

need_ppa bigbluebutton-ubuntu-support-focal.list ppa:bigbluebutton/support 2E1B01D0E95B94BC # Needed for libopusenc0
need_ppa martin-uni-mainz-ubuntu-coturn-focal.list ppa:martin-uni-mainz/coturn 4B77C2225D3BBDB3 # Coturn
fi

#need_ppa libreoffice-ubuntu-ppa-jammy.list ppa:libreoffice/ppa 1378B444 # Latest version of libreoffice

#BigBlueButton support
if [ -f /etc/apt/sources.list.d/bigbluebutton-ubuntu-support-jammy.list ] && grep -q 18 /etc/apt/sources.list.d/bigbluebutton-ubuntu-support-jammy.list; then
sudo rm -r /etc/apt/sources.list.d/bigbluebutton-ubuntu-support-jammy.list
fi
if [ ! -f /etc/apt/sources.list.d/bigbluebutton-ubuntu-support-jammy.list ]; then
if [ -f /etc/apt/keyrings/bigbluebutton-ubuntu-support.gpg]; then
rm -r /etc/apt/keyrings/bigbluebutton-ubuntu-support.gpg
fi
curl -fsSL "https://ppa.launchpadcontent.net/bigbluebutton/support/ubuntu/dists/jammy/Release.gpg" -o /etc/apt/keyrings/bigbluebutton-ubuntu-support-release.gpg
curl -sL 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x2E1B01D0E95B94BC' | gpg --dearmor > /etc/apt/keyrings/bigbluebutton-ubuntu-support.gpg
rm -r /etc/apt/keyrings/bigbluebutton-ubuntu-support-release.gpg
echo "deb [signed-by=/etc/apt/keyrings/bigbluebutton-ubuntu-support.gpg] https://ppa.launchpadcontent.net/bigbluebutton/support/ubuntu/ jammy main" > /etc/apt/sources.list.d/bigbluebutton-ubuntu-support-jammy.list
fi
#BigBlueButton matin mainz coturn
if [ -f /etc/apt/sources.list.d/martin-uni-mainz-ubuntu-coturn-jammy.list ] && grep -q 18 /etc/apt/sources.list.d/bigbluebutton-ubuntu-support-jammy.list; then
sudo rm -r /etc/apt/sources.list.d/martin-uni-mainz-ubuntu-coturn-jammy.list
fi
if [ ! -f /etc/apt/sources.list.d/martin-uni-mainz-ubuntu-coturn-jammy.list ]; then
if [ -f /etc/apt/keyrings/bigbluebutton-ubuntu-support-release.gpg ]; then
rm -r /etc/apt/keyrings/martin-uni-mainz-ubuntu-coturn.gpg
fi
curl https://ppa.launchpadcontent.net/martin-uni-mainz/coturn/ubuntu/dists/jammy/Release.gpg -o /etc/apt/keyrings/Release.gpg
curl -sL 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x4B77C2225D3BBDB3' | gpg --dearmor > /etc/apt/keyrings/martin-uni-mainz-ubuntu-coturn.gpg
rm -r /etc/apt/keyrings/Release.gpg
echo "deb [signed-by=/etc/apt/keyrings/martin-uni-mainz-ubuntu-coturn.gpg] https://ppa.launchpadcontent.net/martin-uni-mainz/coturn/ubuntu/ jammy main" > /etc/apt/sources.list.d/martin-uni-mainz-ubuntu-coturn-jammy.list
fi

if [ -f /etc/apt/sources.list.d/nodesource.list ] && grep -q 18 /etc/apt/sources.list.d/nodesource.list; then
# Node 18 might be installed, previously used in BigBlueButton
Expand All @@ -297,19 +333,18 @@ main() {
sudo rm -r /etc/apt/sources.list.d/nodesource.list
fi
if [ ! -f /etc/apt/sources.list.d/nodesource.list ]; then
sudo mkdir -p /etc/apt/keyrings
if [ -f /etc/apt/keyrings/nodesource.gpg ]; then
rm /etc/apt/keyrings/nodesource.gpg
rm -r /etc/apt/keyrings/nodesource.gpg
fi
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
NODE_MAJOR=22
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | sudo tee /etc/apt/sources.list.d/nodesource.list
fi

# postgres for BigBlueButton core
sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
if [ ! -f /etc/apt/trusted.gpg.d/postgresql.gpg ]; then
curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/postgresql.gpg
sudo sh -c 'echo "deb [signed-by=/etc/apt/keyrings/postgresql.gpg] http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
if [ ! -f /etc/apt/keyrings/postgresql.gpg ]; then
curl -fsSL "https://www.postgresql.org/media/keys/ACCC4CF8.asc" | sudo gpg --dearmor -o /etc/apt/keyrings/postgresql.gpg
fi

touch /root/.rnd
Expand All @@ -320,6 +355,7 @@ main() {

need_pkg openjdk-17-jre
update-java-alternatives -s java-1.17.0-openjdk-amd64
chmod 644 /etc/apt/keyrings/* #make apt readable for apt
fi

apt-get update
Expand Down Expand Up @@ -1374,15 +1410,15 @@ install_docker() {

# Install Docker
if ! apt-key list | grep -q Docker; then
if [ ! -f /usr/share/keyrings/docker-archive-keyring.gpg ]; then
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
if [ ! -f /etc/apt/keyrings/docker-archive-keyring.gpg ]; then
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker-archive-keyring.gpg
fi
fi
if ! dpkg -l | grep -q docker-ce; then

echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu \
echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu \
$(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null

chmod 644 /etc/apt/keyrings/*
apt-get update
need_pkg docker-ce docker-ce-cli containerd.io
fi
Expand All @@ -1397,7 +1433,23 @@ install_docker() {
curl -L "https://github.com/docker/compose/releases/download/1.24.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
chmod +x /usr/local/bin/docker-compose
fi

#Adds the proxy to docker
if [ -f /etc/systemd/system/docker.service.d ]; then
rm -r /etc/systemd/system/docker.service.d
fi
if [ -f /etc/systemd/system/docker.service.d/http-proxy.conf ]; then
rm -r /etc/systemd/system/docker.service.d/http-proxy.conf
fi
mkdir -p /etc/systemd/system/docker.service.d
touch /etc/systemd/system/docker.service.d/http-proxy.conf
echo '[Service]' > /etc/systemd/system/docker.service.d/http-proxy.conf
echo Environment="HTTP_PROXY="$HTTP_PROXY"" >> /etc/systemd/system/docker.service.d/http-proxy.conf
echo Environment="HTTPS_PROXY="$HTTP_PROXY"" >> /etc/systemd/system/docker.service.d/http-proxy.conf
systemctl daemon-reload
systemctl restart docker
docker version > /dev/null || err "docker is failing to restart, something is wrong retry to resolve - exiting"
say "docker is running with proxy!"

# Ensuring docker is running
if ! docker version > /dev/null ; then
# Attempting to auto resolve by restarting docker socket and engine.
Expand Down