From 6aa15b8a21e96c497608d4e19de5bb9a35e151b8 Mon Sep 17 00:00:00 2001 From: hwdsl2 Date: Sat, 31 Jul 2021 15:32:02 -0500 Subject: [PATCH] Update docs --- README-zh.md | 11 ++++++----- README.md | 11 ++++++----- docs/clients-zh.md | 2 +- docs/clients.md | 2 +- docs/uninstall-zh.md | 6 +++--- docs/uninstall.md | 6 +++--- 6 files changed, 20 insertions(+), 18 deletions(-) diff --git a/README-zh.md b/README-zh.md index 8bd3238..4823afb 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 & Rocky Linux +CentOS/RHEL, Rocky Linux & AlmaLinux ```bash @@ -93,6 +93,7 @@ wget https://git.io/vpnsetup-amzn -O vpn.sh && sudo sh vpn.sh && sudo ikev2.sh - - Debian 10 (Buster)[\*](#debian-10-note) 或者 9 (Stretch) - CentOS 8[\*\*](#centos-8-note) 或者 7 - Rocky Linux 8 +- AlmaLinux OS 8 - Red Hat Enterprise Linux (RHEL) 8 或者 7 - Amazon Linux 2 @@ -131,7 +132,7 @@ wget https://git.io/vpnsetup -O vpn.sh && sudo sh vpn.sh
-CentOS/RHEL & Rocky Linux +CentOS/RHEL, Rocky Linux & AlmaLinux ```bash @@ -173,7 +174,7 @@ sudo sh vpn.sh
-CentOS/RHEL & Rocky Linux +CentOS/RHEL, Rocky Linux & AlmaLinux ```bash @@ -226,7 +227,7 @@ sh vpn.sh
-CentOS/RHEL & Rocky Linux +CentOS/RHEL, Rocky Linux & AlmaLinux ```bash @@ -315,7 +316,7 @@ wget https://git.io/vpnupgrade -O vpnup.sh && sudo sh vpnup.sh
-CentOS/RHEL & Rocky Linux +CentOS/RHEL, Rocky Linux & AlmaLinux ```bash diff --git a/README.md b/README.md index 7c4fb2b..2d6c1d8 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 & Rocky Linux +CentOS/RHEL, Rocky Linux & AlmaLinux ```bash @@ -93,6 +93,7 @@ A dedicated server or virtual private server (VPS), freshly installed with one o - Debian 10 (Buster)[\*](#debian-10-note) or 9 (Stretch) - CentOS 8[\*\*](#centos-8-note) or 7 - Rocky Linux 8 +- AlmaLinux OS 8 - Red Hat Enterprise Linux (RHEL) 8 or 7 - Amazon Linux 2 @@ -131,7 +132,7 @@ wget https://git.io/vpnsetup -O vpn.sh && sudo sh vpn.sh
-CentOS/RHEL & Rocky Linux +CentOS/RHEL, Rocky Linux & AlmaLinux ```bash @@ -173,7 +174,7 @@ sudo sh vpn.sh
-CentOS/RHEL & Rocky Linux +CentOS/RHEL, Rocky Linux & AlmaLinux ```bash @@ -226,7 +227,7 @@ sh vpn.sh
-CentOS/RHEL & Rocky Linux +CentOS/RHEL, Rocky Linux & AlmaLinux ```bash @@ -315,7 +316,7 @@ wget https://git.io/vpnupgrade -O vpnup.sh && sudo sh vpnup.sh
-CentOS/RHEL & Rocky Linux +CentOS/RHEL, Rocky Linux & AlmaLinux ```bash diff --git a/docs/clients-zh.md b/docs/clients-zh.md index f66b758..f029710 100644 --- a/docs/clients-zh.md +++ b/docs/clients-zh.md @@ -400,7 +400,7 @@ service xl2tpd restart grep pluto /var/log/auth.log grep xl2tpd /var/log/syslog -# CentOS/RHEL, Rocky Linux & Amazon Linux 2 +# CentOS/RHEL, Rocky Linux, AlmaLinux & Amazon Linux 2 grep pluto /var/log/secure grep xl2tpd /var/log/messages ``` diff --git a/docs/clients.md b/docs/clients.md index d2cc6a0..9eae971 100644 --- a/docs/clients.md +++ b/docs/clients.md @@ -399,7 +399,7 @@ Check the Libreswan (IPsec) and xl2tpd logs for errors: grep pluto /var/log/auth.log grep xl2tpd /var/log/syslog -# CentOS/RHEL, Rocky Linux & Amazon Linux 2 +# CentOS/RHEL, Rocky Linux, AlmaLinux & 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 6cac556..1666ee1 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, Rocky Linux & Amazon Linux 2 +### CentOS/RHEL, Rocky Linux, AlmaLinux & 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, Rocky Linux & Amazon Linux 2 +### CentOS/RHEL, Rocky Linux, AlmaLinux & Amazon Linux 2 编辑 `/etc/sysconfig/iptables` 并删除不需要的规则。你之前的防火墙规则（如果有）备份在 `/etc/sysconfig/iptables.old-日期-时间`。 -**注：** 如果使用 Rocky Linux 或者 CentOS/RHEL 8 并且在安装 VPN 时 firewalld 正在运行，则可能已配置 nftables。编辑 `/etc/sysconfig/nftables.conf` 并删除不需要的规则。你之前的防火墙规则备份在 `/etc/sysconfig/nftables.conf.old-日期-时间`。 +**注：** 如果使用 Rocky Linux, AlmaLinux 或者 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 eb32eff..b6e83f4 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, Rocky Linux & Amazon Linux 2 +### CentOS/RHEL, Rocky Linux, AlmaLinux & 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, Rocky Linux & Amazon Linux 2 +### CentOS/RHEL, Rocky Linux, AlmaLinux & 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 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`. +**Note:** If using Rocky Linux, AlmaLinux 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