From 721ea3306bc7885e77a25c74a66d1dff926d73e2 Mon Sep 17 00:00:00 2001 From: hwdsl2 Date: Sun, 28 Jul 2024 16:45:47 -0500 Subject: [PATCH] Update docs - Remove CentOS 7 and Debian 10, which reached EOL as of June 30, 2024. --- README-zh.md | 4 ++-- README.md | 4 ++-- docs/bbr-zh.md | 43 +------------------------------------------ docs/bbr.md | 43 +------------------------------------------ 4 files changed, 6 insertions(+), 88 deletions(-) diff --git a/README-zh.md b/README-zh.md index 323e5f6..72cbce3 100644 --- a/README-zh.md +++ b/README-zh.md @@ -73,8 +73,8 @@ https://gitlab.com/hwdsl2/setup-ipsec-vpn/-/raw/master/vpnsetup.sh 一个云服务器，虚拟专用服务器 (VPS) 或者专用服务器，安装以下操作系统之一： - Ubuntu 24.04, 22.04 或者 20.04 -- Debian 12, 11 或者 10 -- CentOS 7 或者 CentOS Stream 9 +- Debian 12 或者 11 +- CentOS Stream 9 - Rocky Linux 或者 AlmaLinux 9/8 - Oracle Linux 9, 8 或者 7 - Amazon Linux 2 diff --git a/README.md b/README.md index 775d13d..5b14d7b 100644 --- a/README.md +++ b/README.md @@ -73,8 +73,8 @@ A pre-built [Docker image](https://github.com/hwdsl2/docker-ipsec-vpn-server) is A cloud server, virtual private server (VPS) or dedicated server, with an install of: - Ubuntu 24.04, 22.04 or 20.04 -- Debian 12, 11 or 10 -- CentOS 7 or CentOS Stream 9 +- Debian 12 or 11 +- CentOS Stream 9 - Rocky Linux or AlmaLinux 9/8 - Oracle Linux 9, 8 or 7 - Amazon Linux 2 diff --git a/docs/bbr-zh.md b/docs/bbr-zh.md index 5c0f55f..caea7f3 100644 --- a/docs/bbr-zh.md +++ b/docs/bbr-zh.md @@ -12,7 +12,7 @@ Google BBR已经被内置于Linux内核4.9及更高版本中，但是需要手 可以通过命令 `uname -r` 来查看当前Linux内核版本。版本大于等于4.9时，可以直接参照[下方的说明](#部署-google-bbr)部署BBR。 -通常而言，Ubuntu 18.04+, Debian 10+，CentOS 8+及RHEL 8+的内核版本都大于4.9。但是对于CentOS 7或者Amazon Linux 2，需要通过以下的方式更新内核之后才能部署Google BBR。 +通常而言，Ubuntu 18.04+, Debian 10+，CentOS 8+及RHEL 8+的内核版本都大于4.9。但是对于Amazon Linux 2，需要通过以下的方式更新内核之后才能部署Google BBR。 ### Amazon Linux 2 @@ -35,47 +35,6 @@ Amazon Linux 2提供过经过验证的新版Linux内核，并可以通过启用 uname -r ``` -### CentOS 7 - -当使用CentOS 7时，需要安装由ELRepo Project提供的新版Linux内核。可以在[这个页面](http://elrepo.org/tiki/kernel-ml)找到有关ELRepo Project提供的Linux内核的更多信息。 - -参见下面的安装说明。 - -1. 导入ELRepo Project的公钥。 - ```bash - sudo rpm --import https://www.elrepo.org/RPM-GPG-KEY-elrepo.org - ``` -2. 为 RHEL-7、SL-7 或 CentOS-7 安装 ELRepo。 - ```bash - sudo yum install https://www.elrepo.org/elrepo-release-7.el7.elrepo.noarch.rpm - ``` -3. 安装 `kernel-ml`。 - ```bash - sudo yum --enablerepo=elrepo-kernel install kernel-ml - ``` -4. 确认结果。 - ```bash - rpm -qa | grep kernel - ``` - 你应该在输出中看到 `kernel-ml-xxx`。 -5. 显示 grub2 菜单中的所有条目并设置 `kernel-ml`。 - ```bash - sudo egrep ^menuentry /etc/grub2.cfg | cut -f 2 -d \' - ``` - **索引从 `0` 开始。** - 例如，当 `kernel-ml` 位于 `1` 时，使用下面的命令来激活 `kernel-ml`。 - ```bash - sudo grub2-set-default 1 - ``` -6. 重启。 - ```bash - sudo reboot - ``` -7. 检查 Linux 内核版本。 - ```bash - uname -r - ``` - ## 部署 Google BBR 在这个部分，我们将通过修改配置文件启动Google BBR。 diff --git a/docs/bbr.md b/docs/bbr.md index 39ab692..7fec2ca 100644 --- a/docs/bbr.md +++ b/docs/bbr.md @@ -12,7 +12,7 @@ To learn more about the Google BBR algorithm, see this [official blog](https://c You can check the current Linux kernel version with the command `uname -r`. When the version is greater than or equal to 4.9, you can deploy BBR directly by referring to the [instructions below](#deploy-google-bbr). -Generally speaking, the kernel versions of Ubuntu 18.04+, Debian 10+, CentOS 8+ and RHEL 8+ are greater than 4.9. But for CentOS 7 or Amazon Linux 2, you need to update the kernel in the following ways before deploying Google BBR. +Generally speaking, the kernel versions of Ubuntu 18.04+, Debian 10+, CentOS 8+ and RHEL 8+ are greater than 4.9. But for Amazon Linux 2, you need to update the kernel in the following ways before deploying Google BBR. ### Amazon Linux 2 @@ -35,47 +35,6 @@ Amazon Linux 2 provides newer versions of the verified Linux kernel, which can b uname -r ``` -### CentOS 7 - -When using CentOS 7, a newer Linux kernel provided by the ELRepo Project needs to be installed. More information about the Linux kernels provided by the ELRepo Project can be found at [this page](http://elrepo.org/tiki/kernel-ml). - -Refer to the installation instructions below. - -1. Import ELRepo Project's public key. - ```bash - sudo rpm --import https://www.elrepo.org/RPM-GPG-KEY-elrepo.org - ``` -2. Install ELRepo for RHEL-7, SL-7 or CentOS-7. - ```bash - sudo yum install https://www.elrepo.org/elrepo-release-7.el7.elrepo.noarch.rpm - ``` -3. Install `kernel-ml`. - ```bash - sudo yum --enablerepo=elrepo-kernel install kernel-ml - ``` -4. Confirm the result. - ```bash - rpm -qa | grep kernel - ``` - You should see `kernel-ml-xxx` in output. -5. Show all entries in the grub2 menu and setup `kernel-ml`. - ```bash - sudo egrep ^menuentry /etc/grub2.cfg | cut -f 2 -d \' - ``` - **Indexing starts at `0`.** - For example, when the `kernel-ml` is located at `1`, use the command below to activate `kernel-ml`. - ```bash - sudo grub2-set-default 1 - ``` -6. Reboot. - ```bash - sudo reboot - ``` -7. Check Linux kernel version. - ```bash - uname -r - ``` - ## Deploy Google BBR In this section, we will start Google BBR by modifying the configuration file.