Update README.md
[ci skip]
This commit is contained in:
hwdsl2
parent
59c7227587
commit
12989b4a03
2 changed files with 12 additions and 38 deletions
25
README-zh.md
25
README-zh.md
|
|
@ -56,18 +56,18 @@
|
|||
|
||||
首先，更新你的系统： 运行 `apt-get update && apt-get dist-upgrade` 并重启。这一步是可选的，但推荐。
|
||||
|
||||
**选项 1:** 使用脚本随机生成的 VPN 登录凭证 （会在屏幕上显示）：
|
||||
**选项 1:** 使用脚本随机生成的 VPN 登录凭证 （完成后会在屏幕上显示）：
|
||||
|
||||
```bash
|
||||
wget https://git.io/vpnsetup -O vpnsetup.sh && sudo sh vpnsetup.sh
|
||||
```
|
||||
|
||||
**选项 2:** 输入你自己的 VPN 登录凭证，或者将它们定义为环境变量：
|
||||
**选项 2:** 编辑脚本并提供你自己的 VPN 登录凭证：
|
||||
|
||||
```bash
|
||||
wget https://git.io/vpnsetup -O vpnsetup.sh
|
||||
nano -w vpnsetup.sh
|
||||
[修改为你自己的值： VPN_IPSEC_PSK, VPN_USER 和 VPN_PASSWORD]
|
||||
[替换为你自己的值： YOUR_IPSEC_PSK, YOUR_USERNAME 和 YOUR_PASSWORD]
|
||||
sudo sh vpnsetup.sh
|
||||
```
|
||||
|
||||
|
|
@ -75,22 +75,9 @@ sudo sh vpnsetup.sh
|
|||
|
||||
首先，更新你的系统： 运行 `yum update` 并重启。这一步是可选的，但推荐。
|
||||
|
||||
**选项 1:** 使用脚本随机生成的 VPN 登录凭证 （会在屏幕上显示）：
|
||||
按照与上面相同的步骤，但是将 `https://git.io/vpnsetup` 换成 `https://git.io/vpnsetup-centos`。
|
||||
|
||||
```bash
|
||||
wget https://git.io/vpnsetup-centos -O vpnsetup_centos.sh && sudo sh vpnsetup_centos.sh
|
||||
```
|
||||
|
||||
**选项 2:** 输入你自己的 VPN 登录凭证，或者将它们定义为环境变量：
|
||||
|
||||
```bash
|
||||
wget https://git.io/vpnsetup-centos -O vpnsetup_centos.sh
|
||||
nano -w vpnsetup_centos.sh
|
||||
[修改为你自己的值： VPN_IPSEC_PSK, VPN_USER 和 VPN_PASSWORD]
|
||||
sudo sh vpnsetup_centos.sh
|
||||
```
|
||||
|
||||
如果无法通过 `wget` 下载，你也可以打开 <a href="vpnsetup.sh" target="_blank">vpnsetup.sh</a> (或者 <a href="vpnsetup_centos.sh" target="_blank">vpnsetup_centos.sh</a>)，然后点击右方的 **`Raw`** 按钮。按快捷键 `Ctrl-A` 全选， `Ctrl-C` 复制，然后粘贴到你喜欢的编辑器。
|
||||
注： 如果无法通过 `wget` 下载，你也可以打开 <a href="vpnsetup.sh" target="_blank">vpnsetup.sh</a> (或者 <a href="vpnsetup_centos.sh" target="_blank">vpnsetup_centos.sh</a>)，然后点击右方的 **`Raw`** 按钮。按快捷键 `Ctrl-A` 全选， `Ctrl-C` 复制，然后粘贴到你喜欢的编辑器。
|
||||
|
||||
## 下一步
|
||||
|
||||
|
|
@ -103,7 +90,7 @@ sudo sh vpnsetup_centos.sh
|
|||
|
||||
## 重要提示
|
||||
|
||||
**Windows 用户** 在首次连接之前需要<a href="https://documentation.meraki.com/MX-Z/Client_VPN/Troubleshooting_Client_VPN#Windows_Error_809" target="_blank">修改一次注册表</a>，以解决 VPN 服务器和客户端与 NAT （比如家用路由器）的兼容问题。另外请打开 VPN 连接属性的"安全"选项卡，并确保<a href="https://cloud.githubusercontent.com/assets/5704064/14538812/96b4f930-024b-11e6-9d81-fa3d3db1ce33.png" target="_blank">仅选中 "CHAP" 选项</a>。
|
||||
**Windows 用户** 在首次连接之前需要<a href="https://documentation.meraki.com/MX-Z/Client_VPN/Troubleshooting_Client_VPN#Windows_Error_809" target="_blank">修改一次注册表</a>，以解决 VPN 服务器和客户端与 NAT （比如家用路由器）的兼容问题。另外请打开 VPN 连接属性的 "安全" 选项卡，并确保<a href="https://github.com/hwdsl2/setup-ipsec-vpn/issues/7#issuecomment-182571109" target="_blank">仅选中 "CHAP" 选项</a>。
|
||||
|
||||
**Android 6 (Marshmallow) 用户** 请参考此文档中的注释： <a href="docs/clients-zh.md#android" target="_blank">配置 IPsec/L2TP VPN 客户端</a>。
|
||||
|
||||
|
|
|
|||
25
README.md
25
README.md
|
|
@ -56,18 +56,18 @@ A dedicated server or KVM/Xen-based Virtual Private Server (VPS), freshly instal
|
|||
|
||||
First, update your system with `apt-get update && apt-get dist-upgrade` and reboot. This is optional, but recommended.
|
||||
|
||||
**Option 1:** Have the script generate random VPN credentials for you (will be displayed on the screen):
|
||||
**Option 1:** Have the script generate random VPN credentials for you (will be displayed when finished):
|
||||
|
||||
```bash
|
||||
wget https://git.io/vpnsetup -O vpnsetup.sh && sudo sh vpnsetup.sh
|
||||
```
|
||||
|
||||
**Option 2:** Enter your own VPN credentials, or define them as environment variables:
|
||||
**Option 2:** Edit the script and provide your own VPN credentials:
|
||||
|
||||
```bash
|
||||
wget https://git.io/vpnsetup -O vpnsetup.sh
|
||||
nano -w vpnsetup.sh
|
||||
[Replace with your own values: VPN_IPSEC_PSK, VPN_USER and VPN_PASSWORD]
|
||||
[Replace with your own values: YOUR_IPSEC_PSK, YOUR_USERNAME and YOUR_PASSWORD]
|
||||
sudo sh vpnsetup.sh
|
||||
```
|
||||
|
||||
|
|
@ -75,22 +75,9 @@ sudo sh vpnsetup.sh
|
|||
|
||||
First, update your system with `yum update` and reboot. This is optional, but recommended.
|
||||
|
||||
**Option 1:** Have the script generate random VPN credentials for you (will be displayed on the screen):
|
||||
Follow the same steps as above, but replace `https://git.io/vpnsetup` with `https://git.io/vpnsetup-centos`.
|
||||
|
||||
```bash
|
||||
wget https://git.io/vpnsetup-centos -O vpnsetup_centos.sh && sudo sh vpnsetup_centos.sh
|
||||
```
|
||||
|
||||
**Option 2:** Enter your own VPN credentials, or define them as environment variables:
|
||||
|
||||
```bash
|
||||
wget https://git.io/vpnsetup-centos -O vpnsetup_centos.sh
|
||||
nano -w vpnsetup_centos.sh
|
||||
[Replace with your own values: VPN_IPSEC_PSK, VPN_USER and VPN_PASSWORD]
|
||||
sudo sh vpnsetup_centos.sh
|
||||
```
|
||||
|
||||
If unable to download via `wget`, you may alternatively open <a href="vpnsetup.sh" target="_blank">vpnsetup.sh</a> (or <a href="vpnsetup_centos.sh" target="_blank">vpnsetup_centos.sh</a>) and click the **`Raw`** button. Press `Ctrl-A` to select all, `Ctrl-C` to copy, then paste into your favorite editor.
|
||||
Note: If unable to download via `wget`, you may also open <a href="vpnsetup.sh" target="_blank">vpnsetup.sh</a> (or <a href="vpnsetup_centos.sh" target="_blank">vpnsetup_centos.sh</a>) and click the **`Raw`** button. Press `Ctrl-A` to select all, `Ctrl-C` to copy, then paste into your favorite editor.
|
||||
|
||||
## Next Steps
|
||||
|
||||
|
|
@ -103,7 +90,7 @@ Enjoy your very own VPN! :sparkles::tada::rocket::sparkles:
|
|||
|
||||
## Important Notes
|
||||
|
||||
For **Windows users**, a <a href="https://documentation.meraki.com/MX-Z/Client_VPN/Troubleshooting_Client_VPN#Windows_Error_809" target="_blank">one-time registry change</a> is required if the VPN server and/or client is behind NAT (e.g. home router). In addition, open the "Security" tab of VPN connection properties and make sure <a href="https://cloud.githubusercontent.com/assets/5704064/14538812/96b4f930-024b-11e6-9d81-fa3d3db1ce33.png" target="_blank">only "CHAP" is selected</a>.
|
||||
For **Windows users**, a <a href="https://documentation.meraki.com/MX-Z/Client_VPN/Troubleshooting_Client_VPN#Windows_Error_809" target="_blank">one-time registry change</a> is required if the VPN server and/or client is behind NAT (e.g. home router). In addition, open the "Security" tab of VPN connection properties and make sure <a href="https://github.com/hwdsl2/setup-ipsec-vpn/issues/7#issuecomment-182571109" target="_blank">only "CHAP" is selected</a>.
|
||||
|
||||
**Android 6 (Marshmallow) users**: Please see notes in <a href="docs/clients.md#android" target="_blank">Configure IPsec/L2TP VPN Clients</a>.
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue