From a5f84d11d1b97b8d4ef2f9eee9311db75d137fd8 Mon Sep 17 00:00:00 2001 From: hwdsl2 Date: Sat, 22 Jan 2022 15:34:38 -0600 Subject: [PATCH] Update docs --- README-zh.md | 3 +-- README.md | 3 +-- aws/README-zh.md | 2 +- aws/README.md | 2 +- azure/README-zh.md | 2 +- azure/README.md | 2 +- docs/advanced-usage-zh.md | 2 +- docs/advanced-usage.md | 2 +- docs/clients-xauth-zh.md | 2 +- docs/clients-xauth.md | 2 +- docs/clients-zh.md | 4 ++-- docs/clients.md | 4 ++-- docs/ikev2-howto-zh.md | 6 +++--- docs/ikev2-howto.md | 6 +++--- docs/manage-users-zh.md | 2 +- docs/manage-users.md | 2 +- docs/uninstall-zh.md | 2 +- docs/uninstall.md | 2 +- 18 files changed, 24 insertions(+), 26 deletions(-) diff --git a/README-zh.md b/README-zh.md index e2e89ba..a3efefb 100644 --- a/README-zh.md +++ b/README-zh.md @@ -153,7 +153,7 @@ sh vpn.sh ## 重要提示 -*其他语言版本: [English](README.md#important-notes), [简体中文](README-zh.md#重要提示)。如果你有改进建议，可以在 [这里](https://blog.ls20.com/vpnfeedback) 提交。* +*其他语言版本: [English](README.md#important-notes), [简体中文](README-zh.md#重要提示)。* **Windows 用户** 对于 IPsec/L2TP 模式，在首次连接之前需要 [修改注册表](docs/clients-zh.md#windows-错误-809)，以解决 VPN 服务器或客户端与 NAT（比如家用路由器）的兼容问题。 @@ -205,7 +205,6 @@ wget https://git.io/vpnupgrade -O vpnup.sh && sudo sh vpnup.sh - 有问题需要提问？请先搜索 [已有的 issues](https://github.com/hwdsl2/setup-ipsec-vpn/issues?q=is%3Aissue) 以及在 [这个 Gist](https://gist.github.com/hwdsl2/9030462#comments) 和 [我的博客](https://blog.ls20.com/ipsec-l2tp-vpn-auto-setup-for-ubuntu-12-04-on-amazon-ec2/#disqus_thread) 上已有的留言。 - VPN 的相关问题可在 [Libreswan](https://lists.libreswan.org/mailman/listinfo/swan) 或 [strongSwan](https://lists.strongswan.org/mailman/listinfo/users) 邮件列表提问，或者参考这些网站：[[1]](https://libreswan.org/wiki/Main_Page) [[2]](https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/html/security_guide/sec-securing_virtual_private_networks) [[3]](https://wiki.strongswan.org/projects/strongswan/wiki/UserDocumentation) [[4]](https://wiki.gentoo.org/wiki/IPsec_L2TP_VPN_server) [[5]](https://wiki.archlinux.org/index.php/Openswan_L2TP/IPsec_VPN_client_setup)。 -- 如果你有改进建议或意见，可以在 [这里](https://blog.ls20.com/vpnfeedback) 提交。 - 如果你发现了一个可重复的程序漏洞，请提交一个 [GitHub Issue](https://github.com/hwdsl2/setup-ipsec-vpn/issues?q=is%3Aissue)。 ## 卸载说明 diff --git a/README.md b/README.md index 6706cfa..d0018b8 100644 --- a/README.md +++ b/README.md @@ -153,7 +153,7 @@ Enjoy your very own VPN! :sparkles::tada::rocket::sparkles: ## Important notes -*Read this in other languages: [English](README.md#important-notes), [简体中文](README-zh.md#重要提示). Have a suggestion? [Send feedback](https://blog.ls20.com/vpnfeedback).* +*Read this in other languages: [English](README.md#important-notes), [简体中文](README-zh.md#重要提示).* **Windows users**: For IPsec/L2TP mode, a [one-time registry change](docs/clients.md#windows-error-809) is required if the VPN server or client is behind NAT (e.g. home router). @@ -205,7 +205,6 @@ See [Advanced usage](docs/advanced-usage.md). - Got a question? Please first search [existing issues](https://github.com/hwdsl2/setup-ipsec-vpn/issues?q=is%3Aissue) and comments [in this Gist](https://gist.github.com/hwdsl2/9030462#comments) and [on my blog](https://blog.ls20.com/ipsec-l2tp-vpn-auto-setup-for-ubuntu-12-04-on-amazon-ec2/#disqus_thread). - Ask VPN related questions on the [Libreswan](https://lists.libreswan.org/mailman/listinfo/swan) or [strongSwan](https://lists.strongswan.org/mailman/listinfo/users) mailing list, or read these wikis: [[1]](https://libreswan.org/wiki/Main_Page) [[2]](https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/html/security_guide/sec-securing_virtual_private_networks) [[3]](https://wiki.strongswan.org/projects/strongswan/wiki/UserDocumentation) [[4]](https://wiki.gentoo.org/wiki/IPsec_L2TP_VPN_server) [[5]](https://wiki.archlinux.org/index.php/Openswan_L2TP/IPsec_VPN_client_setup). -- Have a comment or suggestion? [Send feedback](https://blog.ls20.com/vpnfeedback). - If you found a reproducible bug, open a [GitHub Issue](https://github.com/hwdsl2/setup-ipsec-vpn/issues?q=is%3Aissue) to submit a bug report. ## Uninstallation diff --git a/aws/README-zh.md b/aws/README-zh.md index ea3b356..aea2154 100644 --- a/aws/README-zh.md +++ b/aws/README-zh.md @@ -1,6 +1,6 @@ # 使用 CloudFormation 在 Amazon EC2 上部署 -*其他语言版本: [English](README.md), [简体中文](README-zh.md)。如果你有改进建议，可以在 [这里](https://blog.ls20.com/vpnfeedback) 提交。* +*其他语言版本: [English](README.md), [简体中文](README-zh.md)。* 使用这个模板，你可以在 Amazon Elastic Compute Cloud（Amazon EC2）上快速搭建一个 IPsec VPN 服务器。在继续之前，请参见 EC2 [定价细节](https://aws.amazon.com/cn/ec2/pricing/on-demand/)。在部署中使用 `t2.micro` 服务器实例可能符合 [AWS 免费套餐](https://aws.amazon.com/cn/free/) 的资格。 diff --git a/aws/README.md b/aws/README.md index 7d529b3..f9f51a3 100644 --- a/aws/README.md +++ b/aws/README.md @@ -1,6 +1,6 @@ # Deploy to Amazon EC2 using CloudFormation -*Read this in other languages: [English](README.md), [简体中文](README-zh.md). Have a suggestion? [Send feedback](https://blog.ls20.com/vpnfeedback).* +*Read this in other languages: [English](README.md), [简体中文](README-zh.md).* This template will create a fully-working IPsec VPN server on Amazon Elastic Compute Cloud (Amazon EC2). Please make sure to check the EC2 [pricing details](https://aws.amazon.com/ec2/pricing/on-demand/) before continuing. Using a `t2.micro` server instance for your deployment may qualify for the [AWS Free Tier](https://aws.amazon.com/free/). diff --git a/azure/README-zh.md b/azure/README-zh.md index a4c7dbc..95077e9 100644 --- a/azure/README-zh.md +++ b/azure/README-zh.md @@ -1,6 +1,6 @@ # 在 Microsoft Azure 上部署 -*其他语言版本: [English](README.md), [简体中文](README-zh.md)。如果你有改进建议，可以在 [这里](https://blog.ls20.com/vpnfeedback) 提交。* +*其他语言版本: [English](README.md), [简体中文](README-zh.md)。* 使用这个模板，你可以在 Microsoft Azure Cloud 上快速搭建一个 VPN 服务器 （[定价细节](https://azure.microsoft.com/zh-cn/pricing/details/virtual-machines/)）。 diff --git a/azure/README.md b/azure/README.md index e293b2d..effbf31 100644 --- a/azure/README.md +++ b/azure/README.md @@ -1,6 +1,6 @@ # Deploy to Microsoft Azure -*Read this in other languages: [English](README.md), [简体中文](README-zh.md). Have a suggestion? [Send feedback](https://blog.ls20.com/vpnfeedback).* +*Read this in other languages: [English](README.md), [简体中文](README-zh.md).* This template will create a fully working VPN server on the Microsoft Azure Cloud ([pricing details](https://azure.microsoft.com/en-us/pricing/details/virtual-machines/)). diff --git a/docs/advanced-usage-zh.md b/docs/advanced-usage-zh.md index cf45a85..43619fd 100644 --- a/docs/advanced-usage-zh.md +++ b/docs/advanced-usage-zh.md @@ -1,6 +1,6 @@ # 高级用法 -*其他语言版本: [English](advanced-usage.md), [简体中文](advanced-usage-zh.md)。如果你有改进建议，可以在 [这里](https://blog.ls20.com/vpnfeedback) 提交。* +*其他语言版本: [English](advanced-usage.md), [简体中文](advanced-usage-zh.md)。* * [使用其他的 DNS 服务器](#使用其他的-dns-服务器) * [域名和更改服务器 IP](#域名和更改服务器-ip) diff --git a/docs/advanced-usage.md b/docs/advanced-usage.md index 9f9366e..71d5568 100644 --- a/docs/advanced-usage.md +++ b/docs/advanced-usage.md @@ -1,6 +1,6 @@ # Advanced Usage -*Read this in other languages: [English](advanced-usage.md), [简体中文](advanced-usage-zh.md). Have a suggestion? [Send feedback](https://blog.ls20.com/vpnfeedback).* +*Read this in other languages: [English](advanced-usage.md), [简体中文](advanced-usage-zh.md).* * [Use alternative DNS servers](#use-alternative-dns-servers) * [DNS name and server IP changes](#dns-name-and-server-ip-changes) diff --git a/docs/clients-xauth-zh.md b/docs/clients-xauth-zh.md index f9e537c..b071e23 100644 --- a/docs/clients-xauth-zh.md +++ b/docs/clients-xauth-zh.md @@ -1,6 +1,6 @@ # 配置 IPsec/XAuth VPN 客户端 -*其他语言版本: [English](clients-xauth.md), [简体中文](clients-xauth-zh.md)。如果你有改进建议，可以在 [这里](https://blog.ls20.com/vpnfeedback) 提交。* +*其他语言版本: [English](clients-xauth.md), [简体中文](clients-xauth-zh.md)。* **注：** 你也可以使用 [IKEv2](ikev2-howto-zh.md)（推荐）或者 [IPsec/L2TP](clients-zh.md) 模式连接。 diff --git a/docs/clients-xauth.md b/docs/clients-xauth.md index 733f3e1..48c9f0a 100644 --- a/docs/clients-xauth.md +++ b/docs/clients-xauth.md @@ -1,6 +1,6 @@ # Configure IPsec/XAuth VPN Clients -*Read this in other languages: [English](clients-xauth.md), [简体中文](clients-xauth-zh.md). Have a suggestion? [Send feedback](https://blog.ls20.com/vpnfeedback).* +*Read this in other languages: [English](clients-xauth.md), [简体中文](clients-xauth-zh.md).* **Note:** You may also connect using [IKEv2](ikev2-howto.md) (recommended) or [IPsec/L2TP](clients.md) mode. diff --git a/docs/clients-zh.md b/docs/clients-zh.md index 48288bd..b27680a 100644 --- a/docs/clients-zh.md +++ b/docs/clients-zh.md @@ -1,6 +1,6 @@ # 配置 IPsec/L2TP VPN 客户端 -*其他语言版本: [English](clients.md), [简体中文](clients-zh.md)。如果你有改进建议，可以在 [这里](https://blog.ls20.com/vpnfeedback) 提交。* +*其他语言版本: [English](clients.md), [简体中文](clients-zh.md)。* **注：** 你也可以使用 [IKEv2](ikev2-howto-zh.md)（推荐）或者 [IPsec/XAuth](clients-xauth-zh.md) 模式连接。 @@ -237,7 +237,7 @@ Fedora 28（和更新版本）和 CentOS 8/7 用户可以使用 [IPsec/XAuth](cl ## 故障排除 -*其他语言版本: [English](clients.md#troubleshooting), [简体中文](clients-zh.md#故障排除)。如果你有改进建议，可以在 [这里](https://blog.ls20.com/vpnfeedback) 提交。* +*其他语言版本: [English](clients.md#troubleshooting), [简体中文](clients-zh.md#故障排除)。* **另见：** [检查日志及 VPN 状态](#检查日志及-vpn-状态)，[IKEv2 故障排除](ikev2-howto-zh.md#故障排除) 和 [高级用法](advanced-usage-zh.md)。 diff --git a/docs/clients.md b/docs/clients.md index e933290..e2ed0c9 100644 --- a/docs/clients.md +++ b/docs/clients.md @@ -1,6 +1,6 @@ # Configure IPsec/L2TP VPN Clients -*Read this in other languages: [English](clients.md), [简体中文](clients-zh.md). Have a suggestion? [Send feedback](https://blog.ls20.com/vpnfeedback).* +*Read this in other languages: [English](clients.md), [简体中文](clients-zh.md).* **Note:** You may also connect using [IKEv2](ikev2-howto.md) (recommended) or [IPsec/XAuth](clients-xauth.md) mode. @@ -236,7 +236,7 @@ First check [here](https://github.com/nm-l2tp/NetworkManager-l2tp/wiki/Prebuilt- ## Troubleshooting -*Read this in other languages: [English](clients.md#troubleshooting), [简体中文](clients-zh.md#故障排除). Have a suggestion? [Send feedback](https://blog.ls20.com/vpnfeedback).* +*Read this in other languages: [English](clients.md#troubleshooting), [简体中文](clients-zh.md#故障排除).* **See also:** [Check logs and VPN status](#check-logs-and-vpn-status), [IKEv2 troubleshooting](ikev2-howto.md#troubleshooting) and [Advanced usage](advanced-usage.md). diff --git a/docs/ikev2-howto-zh.md b/docs/ikev2-howto-zh.md index 9abd47a..f4ba6f3 100644 --- a/docs/ikev2-howto-zh.md +++ b/docs/ikev2-howto-zh.md @@ -1,6 +1,6 @@ # IKEv2 VPN 配置和使用指南 -*其他语言版本: [English](ikev2-howto.md), [简体中文](ikev2-howto-zh.md)。如果你有改进建议，可以在 [这里](https://blog.ls20.com/vpnfeedback) 提交。* +*其他语言版本: [English](ikev2-howto.md), [简体中文](ikev2-howto-zh.md)。* **注：** 你也可以使用 [IPsec/L2TP](clients-zh.md) 或者 [IPsec/XAuth](clients-xauth-zh.md) 模式连接。 @@ -114,7 +114,7 @@ To customize IKEv2 or client options, run this script without arguments. ## 配置 IKEv2 VPN 客户端 -*其他语言版本: [English](ikev2-howto.md#configure-ikev2-vpn-clients), [简体中文](ikev2-howto-zh.md#配置-ikev2-vpn-客户端)。如果你有改进建议，可以在 [这里](https://blog.ls20.com/vpnfeedback) 提交。* +*其他语言版本: [English](ikev2-howto.md#configure-ikev2-vpn-clients), [简体中文](ikev2-howto-zh.md#配置-ikev2-vpn-客户端)。* **注：** 客户端配置文件的密码可以在 IKEv2 辅助脚本的输出中找到。如果你想要添加或者导出 IKEv2 客户端，只需重新运行[辅助脚本](#使用辅助脚本配置-ikev2)。使用参数 `-h` 显示使用信息。 @@ -768,7 +768,7 @@ sudo ikev2.sh --revokeclient [client name] ## 故障排除 -*其他语言版本: [English](ikev2-howto.md#troubleshooting), [简体中文](ikev2-howto-zh.md#故障排除)。如果你有改进建议，可以在 [这里](https://blog.ls20.com/vpnfeedback) 提交。* +*其他语言版本: [English](ikev2-howto.md#troubleshooting), [简体中文](ikev2-howto-zh.md#故障排除)。* **另见：** [检查日志及 VPN 状态](clients-zh.md#检查日志及-vpn-状态)，[IKEv1 故障排除](clients-zh.md#故障排除) 和 [高级用法](advanced-usage-zh.md)。 diff --git a/docs/ikev2-howto.md b/docs/ikev2-howto.md index bf3002b..0b6a83d 100644 --- a/docs/ikev2-howto.md +++ b/docs/ikev2-howto.md @@ -1,6 +1,6 @@ # Guide: How to Set Up and Use IKEv2 VPN -*Read this in other languages: [English](ikev2-howto.md), [简体中文](ikev2-howto-zh.md). Have a suggestion? [Send feedback](https://blog.ls20.com/vpnfeedback).* +*Read this in other languages: [English](ikev2-howto.md), [简体中文](ikev2-howto-zh.md).* **Note:** You may also connect using [IPsec/L2TP](clients.md) or [IPsec/XAuth](clients-xauth.md) mode. @@ -114,7 +114,7 @@ To customize IKEv2 or client options, run this script without arguments. ## Configure IKEv2 VPN clients -*Read this in other languages: [English](ikev2-howto.md#configure-ikev2-vpn-clients), [简体中文](ikev2-howto-zh.md#配置-ikev2-vpn-客户端). Have a suggestion? [Send feedback](https://blog.ls20.com/vpnfeedback).* +*Read this in other languages: [English](ikev2-howto.md#configure-ikev2-vpn-clients), [简体中文](ikev2-howto-zh.md#配置-ikev2-vpn-客户端).* **Note:** The password for client configuration files can be found in the output of the IKEv2 helper script. If you want to add or export IKEv2 client(s), just run the [helper script](#set-up-ikev2-using-helper-script) again. Use option `-h` to show usage information. @@ -770,7 +770,7 @@ Before continuing, you **must** restart the IPsec service. The IKEv2 setup on th ## Troubleshooting -*Read this in other languages: [English](ikev2-howto.md#troubleshooting), [简体中文](ikev2-howto-zh.md#故障排除). Have a suggestion? [Send feedback](https://blog.ls20.com/vpnfeedback).* +*Read this in other languages: [English](ikev2-howto.md#troubleshooting), [简体中文](ikev2-howto-zh.md#故障排除).* **See also:** [Check logs and VPN status](clients.md#check-logs-and-vpn-status), [IKEv1 troubleshooting](clients.md#troubleshooting) and [Advanced usage](advanced-usage.md). diff --git a/docs/manage-users-zh.md b/docs/manage-users-zh.md index 2dcb10c..97bbb57 100644 --- a/docs/manage-users-zh.md +++ b/docs/manage-users-zh.md @@ -1,6 +1,6 @@ # 管理 VPN 用户 -*其他语言版本: [English](manage-users.md), [简体中文](manage-users-zh.md)。如果你有改进建议，可以在 [这里](https://blog.ls20.com/vpnfeedback) 提交。* +*其他语言版本: [English](manage-users.md), [简体中文](manage-users-zh.md)。* 在默认情况下，将只创建一个用于 VPN 登录的用户账户。如果你需要查看或管理 IPsec/L2TP 和 IPsec/XAuth ("Cisco IPsec") 模式的用户，请阅读本文档。对于 IKEv2，参见 [管理客户端证书](ikev2-howto-zh.md#管理客户端证书)。 diff --git a/docs/manage-users.md b/docs/manage-users.md index c3a6718..221dce0 100644 --- a/docs/manage-users.md +++ b/docs/manage-users.md @@ -1,6 +1,6 @@ # Manage VPN Users -*Read this in other languages: [English](manage-users.md), [简体中文](manage-users-zh.md). Have a suggestion? [Send feedback](https://blog.ls20.com/vpnfeedback).* +*Read this in other languages: [English](manage-users.md), [简体中文](manage-users-zh.md).* By default, a single user account for VPN login is created. If you wish to view or manage users for the IPsec/L2TP and IPsec/XAuth ("Cisco IPsec") modes, read this document. For IKEv2, see [Manage client certificates](ikev2-howto.md#manage-client-certificates). diff --git a/docs/uninstall-zh.md b/docs/uninstall-zh.md index 529063a..a5e2b5a 100644 --- a/docs/uninstall-zh.md +++ b/docs/uninstall-zh.md @@ -1,6 +1,6 @@ # 卸载 VPN -*其他语言版本: [English](uninstall.md), [简体中文](uninstall-zh.md)。如果你有改进建议，可以在 [这里](https://blog.ls20.com/vpnfeedback) 提交。* +*其他语言版本: [English](uninstall.md), [简体中文](uninstall-zh.md)。* * [使用辅助脚本卸载 VPN](#使用辅助脚本卸载-vpn) * [手动卸载 VPN](#手动卸载-vpn) diff --git a/docs/uninstall.md b/docs/uninstall.md index 0cdbecc..7299a7f 100644 --- a/docs/uninstall.md +++ b/docs/uninstall.md @@ -1,6 +1,6 @@ # Uninstall the VPN -*Read this in other languages: [English](uninstall.md), [简体中文](uninstall-zh.md). Have a suggestion? [Send feedback](https://blog.ls20.com/vpnfeedback).* +*Read this in other languages: [English](uninstall.md), [简体中文](uninstall-zh.md).* * [Uninstall using helper script](#uninstall-using-helper-script) * [Manually uninstall the VPN](#manually-uninstall-the-vpn)