diff --git a/1-setup.sh b/1-setup.sh index 612649a..97c4e4a 100644 --- a/1-setup.sh +++ b/1-setup.sh @@ -86,6 +86,7 @@ GUAC_VERSION="1.5.3" # MySQL Connector/J version to install MYSQLJCON="8.2.0" +MYSQLJCON_LINK="https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-j-${MYSQLJCON}.tar.gz" # Set preferred Apache CDN download link GUAC_SOURCE_LINK="http://apache.org/dyn/closer.cgi?action=download&filename=guacamole/${GUAC_VERSION}" @@ -93,6 +94,7 @@ GUAC_SOURCE_LINK="http://apache.org/dyn/closer.cgi?action=download&filename=guac # See https://mariadb.org/mariadb/all-releases/ for available versions. # Provide a specific MySQL version e.g. 11.1.2 or leave blank to use distro default MySQL packages. MYSQL_VERSION="" +MARIADB_LINK="https://downloads.mariadb.com/MariaDB/mariadb_repo_setup" # Guacamole default install URL GUAC_URL=http://localhost:8080/guacamole/ @@ -704,7 +706,9 @@ export DOWNLOAD_DIR="${DOWNLOAD_DIR}" export GUAC_VERSION=$GUAC_VERSION export GUAC_SOURCE_LINK=$GUAC_SOURCE_LINK export MYSQLJCON=$MYSQLJCON +export MYSQLJCON_LINK=$MYSQLJCON_LINK export MYSQL_VERSION=$MYSQL_VERSION +export MARIADB_LINK=$MARIADB_LINK export MYSQLSRV=$MYSQLSRV export MYSQLCLIENT=$MYSQLCLIENT export DB_CMD=$DB_CMD diff --git a/2-install-guacamole.sh b/2-install-guacamole.sh index 06c8d43..37d7cd3 100644 --- a/2-install-guacamole.sh +++ b/2-install-guacamole.sh @@ -58,7 +58,7 @@ if [[ -n "${MYSQL_VERSION}" ]]; then echo -e "${GREY}Adding the official MariaDB repository and installing version ${MYSQL_VERSION}..." # Add the Official MariaDB repo. apt-get -qq -y install curl gnupg2 &>>${INSTALL_LOG} - curl -LsS -O https://downloads.mariadb.com/MariaDB/mariadb_repo_setup &>>${INSTALL_LOG} + curl -LsS -O ${MARIADB_LINK} &>>${INSTALL_LOG} bash mariadb_repo_setup --mariadb-server-version=$MYSQL_VERSION &>>${INSTALL_LOG} if [[ $? -ne 0 ]]; then echo -e "${LRED}Failed. See ${INSTALL_LOG}${GREY}" 1>&2 @@ -165,10 +165,10 @@ else fi # Download MySQL connector/j -wget -q --show-progress -O mysql-connector-j-${MYSQLJCON}.tar.gz https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-j-${MYSQLJCON}.tar.gz +wget -q --show-progress -O mysql-connector-j-${MYSQLJCON}.tar.gz ${MYSQLJCON_LINK} if [[ $? -ne 0 ]]; then echo -e "${LRED}Failed to download mysql-connector-j-${MYSQLJCON}.tar.gz" 1>&2 - echo -e "https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-j-${MYSQLJCON}}.tar.gz${GREY}" + echo -e "${MYSQLJCON_LINK}${GREY}" exit 1 else tar -xzf mysql-connector-j-${MYSQLJCON}.tar.gz