mirror of
https://github.com/hwdsl2/setup-ipsec-vpn.git
synced 2024-06-20 04:36:29 +02:00
Update docs
This commit is contained in:
hwdsl2
parent
e7bbb50670
commit
e785263b5e
19
README-zh.md
19
README-zh.md
|
|
@ -62,6 +62,7 @@ wget https://git.io/vpnsetup -O vpnsetup.sh && sudo sh vpnsetup.sh
|
|||
- <a href="https://wiki.debian.org/Cloud/AmazonEC2Image" target="_blank">Debian 10 (Buster)</a>[\*](#debian-10-note)<a href="https://wiki.debian.org/Cloud/AmazonEC2Image" target="_blank"> 或者 9 (Stretch)</a>
|
||||
- <a href="https://wiki.centos.org/Cloud/AWS" target="_blank">CentOS 8 或者 7</a>
|
||||
- <a href="https://aws.amazon.com/partners/redhat/faqs/" target="_blank">Red Hat Enterprise Linux (RHEL) 8 或者 7</a>
|
||||
- <a href="https://aws.amazon.com/amazon-linux-2/" target="_blank">Amazon Linux 2</a>
|
||||
|
||||
请参见 <a href="https://blog.ls20.com/ipsec-l2tp-vpn-auto-setup-for-ubuntu-12-04-on-amazon-ec2/#vpnsetup" target="_blank">详细步骤</a> 以及 <a href="https://aws.amazon.com/cn/ec2/pricing/" target="_blank">EC2 定价细节</a>。另外，你也可以使用 <a href="aws/README-zh.md" target="_blank">CloudFormation</a> 来快速部署。
|
||||
|
||||
|
|
@ -119,7 +120,7 @@ VPN_PASSWORD='你的VPN密码' \
|
|||
sh vpnsetup.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>，然后点击右方的 **`Raw`** 按钮。按快捷键 `Ctrl-A` 全选， `Ctrl-C` 复制，然后粘贴到你喜欢的编辑器。
|
||||
|
||||
### CentOS & RHEL
|
||||
|
||||
|
|
@ -127,6 +128,14 @@ sh vpnsetup.sh
|
|||
|
||||
按照与上面相同的步骤，但是将 `https://git.io/vpnsetup` 换成 `https://git.io/vpnsetup-centos`。
|
||||
|
||||
### Amazon Linux 2
|
||||
|
||||
首先，更新你的系统： 运行 `yum update` 并重启。这一步是可选的，但推荐。
|
||||
|
||||
按照与上面相同的步骤，但是将 `https://git.io/vpnsetup` 换成 `https://bit.ly/vpnsetup-amzn`。
|
||||
|
||||
**注：** 在阅读本项目的文档时，对于 Amazon Linux 2 请参见 CentOS/RHEL 部分。
|
||||
|
||||
## 下一步
|
||||
|
||||
配置你的计算机或其它设备使用 VPN 。请参见：
|
||||
|
|
@ -167,13 +176,15 @@ sh vpnsetup.sh
|
|||
|
||||
## 升级Libreswan
|
||||
|
||||
提供两个额外的脚本 <a href="extras/vpnupgrade.sh" target="_blank">vpnupgrade.sh</a> 和 <a href="extras/vpnupgrade_centos.sh" target="_blank">vpnupgrade_centos.sh</a>，可用于升级 <a href="https://libreswan.org" target="_blank">Libreswan</a> （<a href="https://github.com/libreswan/libreswan/blob/master/CHANGES" target="_blank">更新日志</a> | <a href="https://lists.libreswan.org/mailman/listinfo/swan-announce" target="_blank">通知列表</a>）。请在运行前根据需要修改 `SWAN_VER` 变量。查看已安装版本： `ipsec --version`.
|
||||
在 <a href="extras/" target="_blank">extras/</a> 目录提供额外的脚本，可用于升级 <a href="https://libreswan.org" target="_blank">Libreswan</a>（<a href="https://github.com/libreswan/libreswan/blob/master/CHANGES" target="_blank">更新日志</a> | <a href="https://lists.libreswan.org/mailman/listinfo/swan-announce" target="_blank">通知列表</a>）。请在运行前根据需要修改 `SWAN_VER` 变量。查看已安装版本： `ipsec --version`.
|
||||
|
||||
```bash
|
||||
# Ubuntu & Debian
|
||||
wget https://git.io/vpnupgrade -O vpnupgrade.sh
|
||||
wget https://git.io/vpnupgrade -O vpnupgrade.sh && sudo sh vpnupgrade.sh
|
||||
# CentOS & RHEL
|
||||
wget https://git.io/vpnupgrade-centos -O vpnupgrade.sh
|
||||
wget https://git.io/vpnupgrade-centos -O vpnupgrade.sh && sudo sh vpnupgrade.sh
|
||||
# Amazon Linux 2
|
||||
wget https://bit.ly/vpnupgrade-amzn -O vpnupgrade.sh && sudo sh vpnupgrade.sh
|
||||
```
|
||||
|
||||
## 问题和反馈
|
||||
|
|
|
|||
19
README.md
19
README.md
|
|
@ -62,6 +62,7 @@ A newly created <a href="https://aws.amazon.com/ec2/" target="_blank">Amazon EC2
|
|||
- <a href="https://wiki.debian.org/Cloud/AmazonEC2Image" target="_blank">Debian 10 (Buster)</a>[\*](#debian-10-note)<a href="https://wiki.debian.org/Cloud/AmazonEC2Image" target="_blank"> or 9 (Stretch)</a>
|
||||
- <a href="https://wiki.centos.org/Cloud/AWS" target="_blank">CentOS 8 or 7</a>
|
||||
- <a href="https://aws.amazon.com/partners/redhat/faqs/" target="_blank">Red Hat Enterprise Linux (RHEL) 8 or 7</a>
|
||||
- <a href="https://aws.amazon.com/amazon-linux-2/" target="_blank">Amazon Linux 2</a>
|
||||
|
||||
See <a href="https://blog.ls20.com/ipsec-l2tp-vpn-auto-setup-for-ubuntu-12-04-on-amazon-ec2/#vpnsetup" target="_blank">detailed instructions</a> and <a href="https://aws.amazon.com/ec2/pricing/" target="_blank">EC2 pricing</a>. Alternatively, you can deploy rapidly using <a href="aws/README.md" target="_blank">CloudFormation</a>.
|
||||
|
||||
|
|
@ -119,7 +120,7 @@ VPN_PASSWORD='your_vpn_password' \
|
|||
sh vpnsetup.sh
|
||||
```
|
||||
|
||||
**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.
|
||||
**Note:** If unable to download via `wget`, you may also open <a href="vpnsetup.sh" target="_blank">vpnsetup.sh</a> and click the **`Raw`** button. Press `Ctrl-A` to select all, `Ctrl-C` to copy, then paste into your favorite editor.
|
||||
|
||||
### CentOS & RHEL
|
||||
|
||||
|
|
@ -127,6 +128,14 @@ First, update your system with `yum update` and reboot. This is optional, but re
|
|||
|
||||
Follow the same steps as above, but replace `https://git.io/vpnsetup` with `https://git.io/vpnsetup-centos`.
|
||||
|
||||
### Amazon Linux 2
|
||||
|
||||
First, update your system with `yum update` and reboot. This is optional, but recommended.
|
||||
|
||||
Follow the same steps as above, but replace `https://git.io/vpnsetup` with `https://bit.ly/vpnsetup-amzn`.
|
||||
|
||||
**Note:** When reading documentation in this project, refer to the CentOS/RHEL sections for Amazon Linux 2.
|
||||
|
||||
## Next steps
|
||||
|
||||
Get your computer or device to use the VPN. Please refer to:
|
||||
|
|
@ -167,13 +176,15 @@ The scripts will backup existing config files before making changes, with `.old-
|
|||
|
||||
## Upgrade Libreswan
|
||||
|
||||
The additional scripts <a href="extras/vpnupgrade.sh" target="_blank">vpnupgrade.sh</a> and <a href="extras/vpnupgrade_centos.sh" target="_blank">vpnupgrade_centos.sh</a> can be used to upgrade <a href="https://libreswan.org" target="_blank">Libreswan</a> (<a href="https://github.com/libreswan/libreswan/blob/master/CHANGES" target="_blank">changelog</a> | <a href="https://lists.libreswan.org/mailman/listinfo/swan-announce" target="_blank">announce</a>). Edit the `SWAN_VER` variable as necessary. Check which version is installed: `ipsec --version`.
|
||||
The additional scripts in <a href="extras/" target="_blank">extras/</a> can be used to upgrade <a href="https://libreswan.org" target="_blank">Libreswan</a> (<a href="https://github.com/libreswan/libreswan/blob/master/CHANGES" target="_blank">changelog</a> | <a href="https://lists.libreswan.org/mailman/listinfo/swan-announce" target="_blank">announce</a>). Edit the `SWAN_VER` variable as necessary. Check which version is installed: `ipsec --version`.
|
||||
|
||||
```bash
|
||||
# Ubuntu & Debian
|
||||
wget https://git.io/vpnupgrade -O vpnupgrade.sh
|
||||
wget https://git.io/vpnupgrade -O vpnupgrade.sh && sudo sh vpnupgrade.sh
|
||||
# CentOS & RHEL
|
||||
wget https://git.io/vpnupgrade-centos -O vpnupgrade.sh
|
||||
wget https://git.io/vpnupgrade-centos -O vpnupgrade.sh && sudo sh vpnupgrade.sh
|
||||
# Amazon Linux 2
|
||||
wget https://bit.ly/vpnupgrade-amzn -O vpnupgrade.sh && sudo sh vpnupgrade.sh
|
||||
```
|
||||
|
||||
## Bugs & Questions
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user