Skip to content

Commit 3126f67

Browse files
committed
Skip MariaDB Repository and install the default 10.3 stack.
1 parent de8653b commit 3126f67

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

install/hst-install-ubuntu.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -561,9 +561,6 @@ echo
561561
# Installing Nginx repo
562562
if [ "$nginx" = 'yes' ]; then
563563
echo "(*) NGINX"
564-
if [ -e $apt/nginx.list ]; then
565-
rm $apt/nginx.list
566-
fi
567564
echo "deb [arch=amd64] http://nginx.org/packages/mainline/$VERSION/ $codename nginx" \
568565
> $apt/nginx.list
569566
wget --quiet http://nginx.org/keys/nginx_signing.key -O /tmp/nginx_signing.key
@@ -581,7 +578,7 @@ if [ "$apache" = 'yes' ]; then
581578
fi
582579

583580
# Installing MariaDB repo
584-
if [ "$mysql" = 'yes' ]; then
581+
if [ "$mysql" = 'yes' ] && [ "$release" != "20.04" ]; then
585582
echo "(*) MariaDB"
586583
echo "deb [arch=amd64] http://ams2.mirrors.digitalocean.com/mariadb/repo/$mariadb_v/$VERSION $codename main" > $apt/mariadb.list
587584
APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 0xF1656F24C74CD1D8 > /dev/null 2>&1

0 commit comments

Comments
 (0)