diff --git a/README-zh.md b/README-zh.md index 592bf44..e0a1cf6 100644 --- a/README-zh.md +++ b/README-zh.md @@ -43,7 +43,7 @@ wget https://git.io/vpnsetup -O vpn.sh && sudo sh vpn.sh && sudo ikev2.sh --auto
-CentOS & RHEL +CentOS/RHEL & Rocky Linux ```bash @@ -84,19 +84,17 @@ wget https://git.io/vpnsetup-amzn -O vpn.sh && sudo sh vpn.sh && sudo ikev2.sh - - 封装所有的 VPN 流量在 UDP 协议，不需要 ESP 协议支持 - 可直接作为 Amazon EC2 实例创建时的用户数据使用 - 包含 `sysctl.conf` 优化设置，以达到更佳的传输性能 -- 已测试：Ubuntu, Debian, CentOS/RHEL 和 Amazon Linux 2 ## 系统要求 -一个新创建的 [Amazon EC2](https://aws.amazon.com/ec2/) 实例，使用这些映像之一： +一个新创建的 [Amazon EC2](https://aws.amazon.com/ec2/) 实例，使用这些映像之一。你可以使用 [CloudFormation](aws/README-zh.md) 或者 [用户数据](https://blog.ls20.com/ipsec-l2tp-vpn-auto-setup-for-ubuntu-12-04-on-amazon-ec2/#vpnsetup) 快速部署，或者 [手动部署](#安装说明)。参见 [EC2 定价细节](https://aws.amazon.com/cn/ec2/pricing/)。 - [Ubuntu 20.04 (Focal) 或者 18.04 (Bionic)](https://cloud-images.ubuntu.com/locator/) - [Debian 10 (Buster)](https://wiki.debian.org/Cloud/AmazonEC2Image)[\*](#debian-10-note)[ 或者 9 (Stretch)](https://wiki.debian.org/Cloud/AmazonEC2Image) - [CentOS 8](https://wiki.centos.org/Cloud/AWS)[\*\*](#centos-8-note)[ 或者 7](https://wiki.centos.org/Cloud/AWS) +- [Rocky Linux 8](https://aws.amazon.com/marketplace/seller-profile?id=01538adc-2664-49d5-b926-3381dffce12d) - [Red Hat Enterprise Linux (RHEL) 8 或者 7](https://aws.amazon.com/partners/redhat/faqs/) - [Amazon Linux 2](https://aws.amazon.com/amazon-linux-2/) -请参见 [详细步骤](https://blog.ls20.com/ipsec-l2tp-vpn-auto-setup-for-ubuntu-12-04-on-amazon-ec2/#vpnsetup) 以及 [EC2 定价细节](https://aws.amazon.com/cn/ec2/pricing/)。另外，你也可以使用 [CloudFormation](aws/README-zh.md) 来快速部署。 - **-或者-** 一个专用服务器或者虚拟专用服务器 (VPS)，全新安装以上操作系统之一。OpenVZ VPS 不受支持，用户可以另外尝试 [OpenVPN](https://github.com/Nyr/openvpn-install)。 @@ -136,7 +134,7 @@ wget https://git.io/vpnsetup -O vpn.sh && sudo sh vpn.sh
-CentOS & RHEL +CentOS/RHEL & Rocky Linux ```bash @@ -178,7 +176,7 @@ sudo sh vpn.sh
-CentOS & RHEL +CentOS/RHEL & Rocky Linux ```bash @@ -231,7 +229,7 @@ sh vpn.sh
-CentOS & RHEL +CentOS/RHEL & Rocky Linux ```bash @@ -320,7 +318,7 @@ wget https://git.io/vpnupgrade -O vpnup.sh && sudo sh vpnup.sh
-CentOS & RHEL +CentOS/RHEL & Rocky Linux ```bash diff --git a/README.md b/README.md index ae9c780..88ef9ec 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ wget https://git.io/vpnsetup -O vpn.sh && sudo sh vpn.sh && sudo ikev2.sh --auto
-CentOS & RHEL +CentOS/RHEL & Rocky Linux ```bash @@ -84,19 +84,17 @@ A pre-built [Docker image](https://github.com/hwdsl2/docker-ipsec-vpn-server) is - Encapsulates all VPN traffic in UDP - does not need ESP protocol - Can be directly used as "user-data" for a new Amazon EC2 instance - Includes `sysctl.conf` optimizations for improved performance -- Tested with Ubuntu, Debian, CentOS/RHEL and Amazon Linux 2 ## Requirements -A newly created [Amazon EC2](https://aws.amazon.com/ec2/) instance, from one of these images: +A newly created [Amazon EC2](https://aws.amazon.com/ec2/) instance, from one of these images. You may deploy rapidly using [CloudFormation](aws/README.md) or [user data](https://blog.ls20.com/ipsec-l2tp-vpn-auto-setup-for-ubuntu-12-04-on-amazon-ec2/#vpnsetup), or [manually deploy](#installation). Refer to [EC2 pricing](https://aws.amazon.com/ec2/pricing/). - [Ubuntu 20.04 (Focal) or 18.04 (Bionic)](https://cloud-images.ubuntu.com/locator/) - [Debian 10 (Buster)](https://wiki.debian.org/Cloud/AmazonEC2Image)[\*](#debian-10-note)[ or 9 (Stretch)](https://wiki.debian.org/Cloud/AmazonEC2Image) - [CentOS 8](https://wiki.centos.org/Cloud/AWS)[\*\*](#centos-8-note)[ or 7](https://wiki.centos.org/Cloud/AWS) +- [Rocky Linux 8](https://aws.amazon.com/marketplace/seller-profile?id=01538adc-2664-49d5-b926-3381dffce12d) - [Red Hat Enterprise Linux (RHEL) 8 or 7](https://aws.amazon.com/partners/redhat/faqs/) - [Amazon Linux 2](https://aws.amazon.com/amazon-linux-2/) -See [detailed instructions](https://blog.ls20.com/ipsec-l2tp-vpn-auto-setup-for-ubuntu-12-04-on-amazon-ec2/#vpnsetup) and [EC2 pricing](https://aws.amazon.com/ec2/pricing/). Alternatively, you may also deploy rapidly using [CloudFormation](aws/README.md). - **-OR-** A dedicated server or virtual private server (VPS), freshly installed with one of the above OS. OpenVZ VPS is not supported, users could instead try [OpenVPN](https://github.com/Nyr/openvpn-install). @@ -136,7 +134,7 @@ wget https://git.io/vpnsetup -O vpn.sh && sudo sh vpn.sh
-CentOS & RHEL +CentOS/RHEL & Rocky Linux ```bash @@ -178,7 +176,7 @@ sudo sh vpn.sh
-CentOS & RHEL +CentOS/RHEL & Rocky Linux ```bash @@ -231,7 +229,7 @@ sh vpn.sh
-CentOS & RHEL +CentOS/RHEL & Rocky Linux ```bash @@ -320,7 +318,7 @@ wget https://git.io/vpnupgrade -O vpnup.sh && sudo sh vpnup.sh
-CentOS & RHEL +CentOS/RHEL & Rocky Linux ```bash diff --git a/docs/clients-zh.md b/docs/clients-zh.md index b552ed4..308e16e 100644 --- a/docs/clients-zh.md +++ b/docs/clients-zh.md @@ -398,7 +398,7 @@ service xl2tpd restart grep pluto /var/log/auth.log grep xl2tpd /var/log/syslog -# CentOS/RHEL & Amazon Linux 2 +# CentOS/RHEL, Rocky Linux & Amazon Linux 2 grep pluto /var/log/secure grep xl2tpd /var/log/messages ``` diff --git a/docs/clients.md b/docs/clients.md index b3dadeb..c35af98 100644 --- a/docs/clients.md +++ b/docs/clients.md @@ -397,7 +397,7 @@ Check the Libreswan (IPsec) and xl2tpd logs for errors: grep pluto /var/log/auth.log grep xl2tpd /var/log/syslog -# CentOS/RHEL & Amazon Linux 2 +# CentOS/RHEL, Rocky Linux & Amazon Linux 2 grep pluto /var/log/secure grep xl2tpd /var/log/messages ``` diff --git a/docs/uninstall-zh.md b/docs/uninstall-zh.md index 6018357..6cac556 100644 --- a/docs/uninstall-zh.md +++ b/docs/uninstall-zh.md @@ -29,7 +29,7 @@ rm -f /etc/init/ipsec.conf /lib/systemd/system/ipsec.service \ `apt-get purge xl2tpd` -### CentOS/RHEL & Amazon Linux 2 +### CentOS/RHEL, Rocky Linux & Amazon Linux 2 `yum remove xl2tpd` @@ -39,11 +39,11 @@ rm -f /etc/init/ipsec.conf /lib/systemd/system/ipsec.service \ 编辑 `/etc/iptables.rules` 并删除不需要的规则。你之前的防火墙规则（如果有）备份在 `/etc/iptables.rules.old-日期-时间`。另外如果文件 `/etc/iptables/rules.v4` 存在，请编辑它。 -### CentOS/RHEL & Amazon Linux 2 +### CentOS/RHEL, Rocky Linux & Amazon Linux 2 编辑 `/etc/sysconfig/iptables` 并删除不需要的规则。你之前的防火墙规则（如果有）备份在 `/etc/sysconfig/iptables.old-日期-时间`。 -**注：** 如果使用 CentOS/RHEL 8 并且在安装 VPN 时 firewalld 正在运行，则可能已配置 nftables。编辑 `/etc/sysconfig/nftables.conf` 并删除不需要的规则。你之前的防火墙规则备份在 `/etc/sysconfig/nftables.conf.old-日期-时间`。 +**注：** 如果使用 Rocky Linux 或者 CentOS/RHEL 8 并且在安装 VPN 时 firewalld 正在运行，则可能已配置 nftables。编辑 `/etc/sysconfig/nftables.conf` 并删除不需要的规则。你之前的防火墙规则备份在 `/etc/sysconfig/nftables.conf.old-日期-时间`。 ## 第四步 diff --git a/docs/uninstall.md b/docs/uninstall.md index 7419ec4..eb32eff 100644 --- a/docs/uninstall.md +++ b/docs/uninstall.md @@ -29,7 +29,7 @@ rm -f /etc/init/ipsec.conf /lib/systemd/system/ipsec.service \ `apt-get purge xl2tpd` -### CentOS/RHEL & Amazon Linux 2 +### CentOS/RHEL, Rocky Linux & Amazon Linux 2 `yum remove xl2tpd` @@ -39,11 +39,11 @@ rm -f /etc/init/ipsec.conf /lib/systemd/system/ipsec.service \ Edit `/etc/iptables.rules` and remove unneeded rules. Your original rules (if any) are backed up as `/etc/iptables.rules.old-date-time`. In addition, edit `/etc/iptables/rules.v4` if the file exists. -### CentOS/RHEL & Amazon Linux 2 +### CentOS/RHEL, Rocky Linux & Amazon Linux 2 Edit `/etc/sysconfig/iptables` and remove unneeded rules. Your original rules (if any) are backed up as `/etc/sysconfig/iptables.old-date-time`. -**Note:** If using CentOS/RHEL 8 and firewalld was active during VPN setup, nftables may be configured. Edit `/etc/sysconfig/nftables.conf` and remove unneeded rules. Your original rules are backed up as `/etc/sysconfig/nftables.conf.old-date-time`. +**Note:** If using Rocky Linux or CentOS/RHEL 8 and firewalld was active during VPN setup, nftables may be configured. Edit `/etc/sysconfig/nftables.conf` and remove unneeded rules. Your original rules are backed up as `/etc/sysconfig/nftables.conf.old-date-time`. ## Fourth step