diff --git a/.github/workflows/test-core-linux.yml b/.github/workflows/test-core-linux.yml index 6d85ec66b..e5cf03aed 100644 --- a/.github/workflows/test-core-linux.yml +++ b/.github/workflows/test-core-linux.yml @@ -65,7 +65,7 @@ jobs: curl https://nginx.org/keys/nginx_signing.key | gpg --dearmor | sudo tee /usr/share/keyrings/nginx-archive-keyring.gpg >/dev/null echo "deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] http://nginx.org/packages/ubuntu `lsb_release -cs` nginx" | sudo tee /etc/apt/sources.list.d/nginx.list sudo apt update - sudo apt install -y nginx=1.24.0-1~jammy + sudo apt install -y nginx=1.26.0-1~jammy - name: Fix version without a starting number if: inputs.RELEASE == 'testing' || inputs.RELEASE == 'dev' run: echo "force-bad-version" | sudo tee -a /etc/dpkg/dpkg.cfg diff --git a/.github/workflows/tests-ui-linux.yml b/.github/workflows/tests-ui-linux.yml index 3128b4f14..47bec5bdd 100644 --- a/.github/workflows/tests-ui-linux.yml +++ b/.github/workflows/tests-ui-linux.yml @@ -65,7 +65,7 @@ jobs: curl https://nginx.org/keys/nginx_signing.key | gpg --dearmor | sudo tee /usr/share/keyrings/nginx-archive-keyring.gpg >/dev/null echo "deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] http://nginx.org/packages/ubuntu `lsb_release -cs` nginx" | sudo tee /etc/apt/sources.list.d/nginx.list sudo apt update - sudo apt install -y nginx=1.24.0-1~jammy + sudo apt install -y nginx=1.26.0-1~jammy - name: Fix version without a starting number if: inputs.RELEASE == 'testing' || inputs.RELEASE == 'dev' || inputs.RELEASE == 'ui' run: echo "force-bad-version" | sudo tee -a /etc/dpkg/dpkg.cfg diff --git a/README.md b/README.md index c537b098b..929e550f9 100644 --- a/README.md +++ b/README.md @@ -283,9 +283,6 @@ Repositories of Linux packages for BunkerWeb are available on [PackageCloud](htt You will find more information in the [Linux section](https://docs.bunkerweb.io/1.5.8/integrations/?utm_campaign=self&utm_source=github#linux) of the documentation. -> [!IMPORTANT] -> As of Ubuntu 24.04, the `nginx` package is not available in the official repository. You will need to use the `jammy` repository to install NGINX 1.24.0. Also we do not yet run automated tests on Ubuntu 24.04, so please consider this version as experimental. - ## Microsoft Azure

diff --git a/docs/integrations.md b/docs/integrations.md index 063675404..25a4c9df2 100644 --- a/docs/integrations.md +++ b/docs/integrations.md @@ -320,7 +320,7 @@ Supported Linux distributions for BunkerWeb (amd64/x86_64 and arm64/aarch64 arch - Red Hat Enterprise Linux (RHEL) 8.9 - Red Hat Enterprise Linux (RHEL) 9.4 -Please ensure that you have **NGINX 1.24.0 installed before installing BunkerWeb**. For all distributions, except Fedora, it is mandatory to use prebuilt packages from the [official NGINX repository](https://nginx.org/en/linux_packages.html). Compiling NGINX from source or using packages from different repositories will not work with the official prebuilt packages of BunkerWeb. However, you have the option to build BunkerWeb from source. +Please ensure that you have **NGINX 1.26.0 installed before installing BunkerWeb**. For all distributions, except Fedora, it is mandatory to use prebuilt packages from the [official NGINX repository](https://nginx.org/en/linux_packages.html). Compiling NGINX from source or using packages from different repositories will not work with the official prebuilt packages of BunkerWeb. However, you have the option to build BunkerWeb from source. To simplify the installation process, Linux package repositories for BunkerWeb are available on [PackageCloud](https://packagecloud.io/bunkerity/bunkerweb). They provide a bash script that automatically adds and trusts the repository. You can follow the provided script for automatic setup, or opt for [manual installation](https://packagecloud.io/bunkerity/bunkerweb/install) instructions if you prefer. @@ -337,11 +337,11 @@ To simplify the installation process, Linux package repositories for BunkerWeb a | sudo tee /etc/apt/sources.list.d/nginx.list ``` - You should now be able to install NGINX 1.24.0 : + You should now be able to install NGINX 1.26.0 : ```shell sudo apt update && \ - sudo apt install -y nginx=1.24.0-1~$(lsb_release -cs) + sudo apt install -y nginx=1.26.0-1~$(lsb_release -cs) ``` !!! warning "Testing/dev version" @@ -373,11 +373,6 @@ To simplify the installation process, Linux package repositories for BunkerWeb a === "Ubuntu" - !!! example "Specifications for Ubuntu 24.04" - As of Ubuntu 24.04, the `nginx` package is not available in the official repository. You will need to use the `jammy` repository to install NGINX 1.24.0. - - Also we do not yet run automated tests on Ubuntu 24.04, so please consider this version as experimental. - The first step is to add NGINX official repository : ```shell @@ -385,15 +380,15 @@ To simplify the installation process, Linux package repositories for BunkerWeb a curl https://nginx.org/keys/nginx_signing.key | gpg --dearmor \ | sudo tee /usr/share/keyrings/nginx-archive-keyring.gpg >/dev/null && \ echo "deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] \ - http://nginx.org/packages/ubuntu jammy nginx" \ + http://nginx.org/packages/ubuntu `lsb_release -cs` nginx" \ | sudo tee /etc/apt/sources.list.d/nginx.list ``` - You should now be able to install NGINX 1.24.0 : + You should now be able to install NGINX 1.26.0 : ```shell sudo apt update && \ - sudo apt install -y nginx=1.24.0-1~jammy + sudo apt install -y nginx=1.26.0-1~$(lsb_release -cs) ``` !!! warning "Testing/dev version" @@ -425,10 +420,10 @@ To simplify the installation process, Linux package repositories for BunkerWeb a === "Fedora" - Fedora already provides NGINX 1.24.0 that we support : + Fedora already provides NGINX 1.26.0 that we support : ```shell - sudo dnf install -y nginx-1.24.0 + sudo dnf install -y nginx-1.26.0 ``` Optional step : if you want to automatically enable the [setup wizard](web-ui.md#setup-wizard) when BunkerWeb is installed, export the following variable : @@ -476,10 +471,10 @@ To simplify the installation process, Linux package repositories for BunkerWeb a module_hotfixes=true ``` - You should now be able to install NGINX 1.24.0 : + You should now be able to install NGINX 1.26.0 : ```shell - sudo dnf install nginx-1.24.0 + sudo dnf install nginx-1.26.0 ``` Optional step : if you want to automatically enable the [setup wizard](web-ui.md#setup-wizard) when BunkerWeb is installed, export the following variable : diff --git a/tests/Upgrade.py b/tests/Upgrade.py index e9f17fe85..bd5dac96b 100644 --- a/tests/Upgrade.py +++ b/tests/Upgrade.py @@ -4,7 +4,7 @@ import tempfile import time import pathlib -NGINX_VERSION = "1.24.0" +NGINX_VERSION = "1.26.0" distro = sys.argv[1] if distro == "ubuntu": @@ -595,7 +595,7 @@ elif distro == "debian": echo "deb-src https://nginx.org/packages/debian/ bookworm nginx" >> /etc/apt/sources.list.d/nginx.list && \ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys ABF5BD827BD9BF62 && \ apt-get update && \ - apt-get install -y --no-install-recommends nginx=1.24.0-1~bookworm + apt-get install -y --no-install-recommends nginx=1.26.0-1~bookworm apt install /data/bunkerweb.deb -y """ @@ -947,7 +947,7 @@ elif distro == "debian": echo "deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] \ http://nginx.org/packages/debian `lsb_release -cs` nginx" \ | sudo tee /etc/apt/sources.list.d/nginx.list - sudo apt update && sudo apt install -y nginx=1.24.0-1~bookworm + sudo apt update && sudo apt install -y nginx=1.26.0-1~bookworm curl -s https://packagecloud.io/install/repositories/bunkerity/bunkerweb/script.deb.sh | sudo bash && \ sudo apt update && \ sudo apt install -y bunkerweb=1.4.5 @@ -1647,15 +1647,15 @@ elif distro.startswith("rhel"): bash_script = ( """ dnf install yum-utils wget sudo -y - wget https://nginx.org/packages/rhel/9/x86_64/RPMS/nginx-1.24.0-1.el9.ngx.x86_64.rpm - dnf install nginx-1.24.0-1.el9.ngx.x86_64.rpm -y + wget https://nginx.org/packages/rhel/9/x86_64/RPMS/nginx-1.26.0-1.el9.ngx.x86_64.rpm + dnf install nginx-1.26.0-1.el9.ngx.x86_64.rpm -y dnf install /data/bunkerweb.rpm -y """ if distro.endswith("9") else """ dnf install yum-utils wget sudo -y - wget https://nginx.org/packages/rhel/8/x86_64/RPMS/nginx-1.24.0-1.el8.ngx.x86_64.rpm - dnf install nginx-1.24.0-1.el8.ngx.x86_64.rpm -y + wget https://nginx.org/packages/rhel/8/x86_64/RPMS/nginx-1.26.0-1.el8.ngx.x86_64.rpm + dnf install nginx-1.26.0-1.el8.ngx.x86_64.rpm -y dnf install /data/bunkerweb.rpm -y """ )