From 9893379eef51c74689cc2362b4eddbf61452ff6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophile=20Diot?= <57175294+TheophileDiot@users.noreply.github.com> Date: Mon, 7 Jul 2025 10:04:01 +0200 Subject: [PATCH] Refactor: Changed the way we install BunkerWeb by leveraging the brand new install-bunkerweb.sh (#5707) Co-authored-by: CanbiZ <47820557+MickLesk@users.noreply.github.com> --- ct/bunkerweb.sh | 4 ++-- frontend/public/json/bunkerweb.json | 7 ++++++- install/bunkerweb-install.sh | 15 ++++----------- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/ct/bunkerweb.sh b/ct/bunkerweb.sh index 5383c9ea9..c58d3680c 100644 --- a/ct/bunkerweb.sh +++ b/ct/bunkerweb.sh @@ -37,8 +37,8 @@ Pin: version ${RELEASE} Pin-Priority: 1001 EOF apt-get update - apt-get install -y nginx=1.26.3* - apt-get install -y bunkerweb=${RELEASE} + apt-mark unhold bunkerweb nginx + apt-get install -y --allow-downgrades bunkerweb=${RELEASE} echo "${RELEASE}" >/opt/${APP}_version.txt msg_ok "Updated ${APP} to ${RELEASE}" diff --git a/frontend/public/json/bunkerweb.json b/frontend/public/json/bunkerweb.json index 3cb7ca70d..9fe806f6d 100644 --- a/frontend/public/json/bunkerweb.json +++ b/frontend/public/json/bunkerweb.json @@ -31,5 +31,10 @@ "username": null, "password": null }, - "notes": [] + "notes": [ + { + "text": "WARNING: Installation sources scripts outside of Community Scripts repo. Please check the source before installing.", + "type": "warning" + } + ] } diff --git a/install/bunkerweb-install.sh b/install/bunkerweb-install.sh index ac6c0fc58..6dab4dfba 100644 --- a/install/bunkerweb-install.sh +++ b/install/bunkerweb-install.sh @@ -18,19 +18,12 @@ $STD apt-get install -y apt-transport-https $STD apt-get install -y lsb-release msg_ok "Installed Dependencies" -msg_info "Installing Nginx" -curl -fsSL "https://nginx.org/keys/nginx_signing.key" | gpg --dearmor >/usr/share/keyrings/nginx-archive-keyring.gpg -echo "deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] http://nginx.org/packages/debian $(lsb_release -cs) nginx" >/etc/apt/sources.list.d/nginx.list -$STD apt-get update -$STD apt-get install -y nginx=1.26.3* -msg_ok "Installed Nginx" - RELEASE=$(curl -fsSL https://api.github.com/repos/bunkerity/bunkerweb/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }') msg_info "Installing BunkerWeb v${RELEASE} (Patience)" -curl -fsSL "https://repo.bunkerweb.io/bunkerity/bunkerweb/gpgkey" | gpg --dearmor >/etc/apt/keyrings/bunkerity_bunkerweb-archive-keyring.gpg -echo "deb [signed-by=/etc/apt/keyrings/bunkerity_bunkerweb-archive-keyring.gpg] https://repo.bunkerweb.io/bunkerity/bunkerweb/debian/ bookworm main" >/etc/apt/sources.list.d/bunkerity_bunkerweb.list -$STD apt-get update -$STD apt-get install -y bunkerweb=${RELEASE} +curl -fsSL -o install-bunkerweb.sh https://github.com/bunkerity/bunkerweb/raw/v${RELEASE}/misc/install-bunkerweb.sh +chmod +x install-bunkerweb.sh +$STD ./install-bunkerweb.sh --yes +$STD apt-mark unhold bunkerweb nginx cat </etc/apt/preferences.d/bunkerweb Package: bunkerweb Pin: version ${RELEASE}