From 322ffa8204b4e724ff27115bb28ae6d45bedc01e Mon Sep 17 00:00:00 2001 From: Edi Septriyanto Date: Mon, 17 Apr 2023 01:08:51 +0700 Subject: [PATCH] Add MyGuard OpenSSL 3 repo --- scripts/install_nginx.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/scripts/install_nginx.sh b/scripts/install_nginx.sh index ef012ce..bcd8648 100755 --- a/scripts/install_nginx.sh +++ b/scripts/install_nginx.sh @@ -34,9 +34,6 @@ function add_nginx_repo_ondrej() { local NGINX_REPO="nginx" fi - #local ALTERNATIVE_REPO=false - #[[ "${RELEASE_NAME}" == "jessie" || "${RELEASE_NAME}" == "xenial" ]] && ALTERNATIVE_REPO=true - case "${DISTRIB_NAME}" in debian) if [[ ! -f "/etc/apt/sources.list.d/ondrej-${NGINX_REPO}-${RELEASE_NAME}.list" ]]; then @@ -87,6 +84,7 @@ function add_nginx_repo_myguard() { if [[ ! -f "/etc/apt/sources.list.d/myguard-${NGINX_REPO}-${RELEASE_NAME}.list" ]]; then run touch "/etc/apt/sources.list.d/myguard-${NGINX_REPO}-${RELEASE_NAME}.list" run bash -c "echo 'deb [arch=${DISTRIB_ARCH}] http://deb.myguard.nl ${RELEASE_NAME} main' > /etc/apt/sources.list.d/myguard-${NGINX_REPO}-${RELEASE_NAME}.list" + run bash -c "echo 'deb [arch=${DISTRIB_ARCH}] http://deb.myguard.nl/openssl3 ${RELEASE_NAME} main' > /etc/apt/sources.list.d/myguard-${NGINX_REPO}-${RELEASE_NAME}.list" run wget -qO "/etc/apt/trusted.gpg.d/deb.myguard.nl.gpg" "https://deb.myguard.nl/pool/deb.myguard.nl.gpg" run apt-get update -q -y else @@ -138,7 +136,7 @@ function init_nginx_install() { #if [[ "${NGINX_INSTALLER}" == "repo" ]]; then # MyGuard repo only support mainline version. - echo "Switch Nginx to the mainline/latest version." + echo "Switch Nginx repo to the mainline/latest version." SELECTED_INSTALLER="repo" SELECTED_REPO="myguard" @@ -156,7 +154,7 @@ function init_nginx_install() { add_nginx_repo_ondrej fi - echo "Installing Nginx from package repository..." + echo "Installing Nginx from ${SELECTED_REPO} repository..." #if hash apt-get 2>/dev/null; then if [[ -n "${NGINX_PKG}" ]]; then