diff --git a/README-zh.md b/README-zh.md index 46326a9..47f339c 100644 --- a/README-zh.md +++ b/README-zh.md @@ -1,7 +1,7 @@ # IPsec VPN 服务器一键安装脚本 [![Build Status](https://static.ls20.com/travis-ci/setup-ipsec-vpn.svg)](https://travis-ci.org/hwdsl2/setup-ipsec-vpn) -[![Author](https://img.shields.io/badge/author-Lin%20Song-orange.svg?maxAge=2592000)](https://www.linkedin.com/in/linsongui) +[![Author](https://img.shields.io/badge/author-Lin%20Song-blue.svg?maxAge=2592000)](#作者) [![GitHub stars](https://img.shields.io/github/stars/hwdsl2/setup-ipsec-vpn.svg?maxAge=3600)](https://github.com/hwdsl2/setup-ipsec-vpn/stargazers) [![Docker Pulls](https://img.shields.io/docker/pulls/hwdsl2/ipsec-vpn-server.svg?maxAge=3600)](https://github.com/hwdsl2/docker-ipsec-vpn-server) @@ -54,7 +54,7 @@ IPsec VPN 可以加密你的网络流量，以防止在通过因特网传送时 **-或者-** -一个专用服务器或者虚拟专用服务器 (VPS)，全新安装以上操作系统之一。另外也可使用 Debian 7 (Wheezy)，但是必须首先运行另一个脚本。 OpenVZ VPS 不受支持，用户可以尝试使用 ShadowsocksR 或者 OpenVPN。 +一个专用服务器或者虚拟专用服务器 (VPS)，全新安装以上操作系统之一。另外也可使用 Debian 7 (Wheezy)，但是必须首先运行另一个脚本。 OpenVZ VPS 不受支持，用户可以尝试使用 Shadowsocks/ShadowsocksR 或者 OpenVPN。 这也包括各种云计算服务中的 Linux 虚拟机，比如 Google Compute Engine, Amazon EC2, Microsoft Azure, IBM SoftLayer, VMware vCloud Air, Rackspace, DigitalOcean, Vultr 和 Linode。 @@ -137,7 +137,14 @@ DigitalOcean 用户可以参考这个vpnupgrade.sh 和 vpnupgrade_centos.sh，可用于升级 Libreswan （网站 | 通知列表）。请在运行前根据需要修改 `swan_ver` 变量。检查已安装版本： `ipsec --version` +提供两个额外的脚本 vpnupgrade.sh 和 vpnupgrade_centos.sh，可用于升级 Libreswan （网站 | 通知列表）。请在运行前根据需要修改 `swan_ver` 变量。检查已安装版本： `ipsec --version`. + +```bash +# Ubuntu & Debian +wget https://git.io/vpnupgrade -O vpnupgrade.sh +# CentOS & RHEL +wget https://git.io/vpnupgrade-centos -O vpnupgrade.sh +``` ## 问题和反馈 @@ -155,7 +162,7 @@ DigitalOcean 用户可以参考这个IKEv2 VPN Server on Docker - Streisand - SoftEther VPN -- ShadowsocksR +- Shadowsocks/ShadowsocksR - OpenVPN Install - Setup strongSwan diff --git a/README.md b/README.md index 6cbe35d..744630f 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # IPsec VPN Server Auto Setup Scripts [![Build Status](https://static.ls20.com/travis-ci/setup-ipsec-vpn.svg)](https://travis-ci.org/hwdsl2/setup-ipsec-vpn) -[![Author](https://img.shields.io/badge/author-Lin%20Song-orange.svg?maxAge=2592000)](https://www.linkedin.com/in/linsongui) +[![Author](https://img.shields.io/badge/author-Lin%20Song-blue.svg?maxAge=2592000)](#author) [![GitHub stars](https://img.shields.io/github/stars/hwdsl2/setup-ipsec-vpn.svg?maxAge=3600)](https://github.com/hwdsl2/setup-ipsec-vpn/stargazers) [![Docker Pulls](https://img.shields.io/docker/pulls/hwdsl2/ipsec-vpn-server.svg?maxAge=3600)](https://github.com/hwdsl2/docker-ipsec-vpn-server) @@ -137,7 +137,14 @@ The scripts will backup existing config files before making changes, with `.old- ## Upgrade Libreswan -The additional scripts vpnupgrade.sh and vpnupgrade_centos.sh can be used to upgrade Libreswan (website | mailing list). Edit the `swan_ver` variable as necessary. Check installed version: `ipsec --version` +The additional scripts vpnupgrade.sh and vpnupgrade_centos.sh can be used to upgrade Libreswan (website | mailing list). Edit the `swan_ver` variable as necessary. Check installed version: `ipsec --version`. + +```bash +# Ubuntu & Debian +wget https://git.io/vpnupgrade -O vpnupgrade.sh +# CentOS & RHEL +wget https://git.io/vpnupgrade-centos -O vpnupgrade.sh +``` ## Bugs & Questions @@ -155,7 +162,7 @@ Please refer to Uninstall the VPNIKEv2 VPN Server on Docker - Streisand - SoftEther VPN -- ShadowsocksR +- Shadowsocks/ShadowsocksR - OpenVPN Install - Setup strongSwan diff --git a/docs/clients-zh.md b/docs/clients-zh.md index 6bb09fe..f2a931b 100644 --- a/docs/clients-zh.md +++ b/docs/clients-zh.md @@ -234,7 +234,11 @@ sudo route del default dev ppp0 ### 其它错误 -更多的故障排除信息请参见 这个文档。 +更多的故障排除信息请参见以下链接： + +https://documentation.meraki.com/MX-Z/Client_VPN/Troubleshooting_Client_VPN#Common_Connection_Issues +https://blogs.technet.microsoft.com/rrasblog/2009/08/12/troubleshooting-common-vpn-related-errors/ +http://www.tp-link.com/en/faq-1029.html ## 致谢 diff --git a/docs/clients.md b/docs/clients.md index 37d0dbf..e6ed18f 100644 --- a/docs/clients.md +++ b/docs/clients.md @@ -234,7 +234,11 @@ If you are unable to connect using Android 6.0 (Marshmallow) or 7.0 (Nougat), tr ### Other Errors -Please refer to this document for more troubleshooting tips. +Refer to the links below for more troubleshooting tips: + +https://documentation.meraki.com/MX-Z/Client_VPN/Troubleshooting_Client_VPN#Common_Connection_Issues +https://blogs.technet.microsoft.com/rrasblog/2009/08/12/troubleshooting-common-vpn-related-errors/ +http://www.tp-link.com/en/faq-1029.html ## Credits diff --git a/docs/ikev2-howto.md b/docs/ikev2-howto.md index 117b162..c73d758 100644 --- a/docs/ikev2-howto.md +++ b/docs/ikev2-howto.md @@ -207,7 +207,7 @@ First, make sure you have successfully this workaround. If it doesn't work, please connect using IPsec/L2TP or IPsec/XAuth modes instead. +The built-in VPN client in Windows 7 and newer does not support IKEv2 fragmentation. On some networks, this can cause the connection to fail with "Error 809", or you may be unable to open any website after connecting. If this happens, first try this workaround. If it doesn't work, please connect using IPsec/L2TP or IPsec/XAuth instead. ## References diff --git a/docs/manage-users-zh.md b/docs/manage-users-zh.md index 3c62ee0..57aa64f 100644 --- a/docs/manage-users-zh.md +++ b/docs/manage-users-zh.md @@ -2,7 +2,7 @@ *其他语言版本: [English](manage-users.md), [简体中文](manage-users-zh.md).* -在默认情况下，将只创建一个用于 VPN 登录的用户账户。如果你需要添加，编辑或者删除用户，请阅读本文档。 +在默认情况下，将只创建一个用于 VPN 登录的用户账户。如果你需要添加，修改或者删除用户，请阅读本文档。 首先，IPsec PSK (预共享密钥) 保存在文件 `/etc/ipsec.secrets`。如果要更换一个新的 PSK，可以编辑此文件。