From d8fd5cddc645b67c996b7be10bb33de2a5edac96 Mon Sep 17 00:00:00 2001 From: Lin Song Date: Wed, 17 Feb 2016 18:30:30 -0600 Subject: [PATCH] Update README.md --- README.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index e34904b..738ba00 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ We will use Libreswan as th ## Requirements -A newly created Amazon EC2 instance, using these AMIs: (Follow this link for instructions) +A newly created Amazon EC2 instance, using these AMIs: (See instructions) - Ubuntu 14.04 (Trusty) or 12.04 (Precise) - Debian 8 (Jessie) EC2 Images - CentOS 7 (x86_64) with Updates HVM @@ -36,7 +36,7 @@ OpenVZ VPS users should instead try **» I want to run my own VPN but don't have a server for that** -:warning: **DO NOT run these scripts on your PC or Mac! They are meant to be run on a dedicated server or VPS!** +:warning: **DO NOT run these scripts on your PC or Mac! They should only be run on a dedicated server or VPS!** ## Installation @@ -63,7 +63,7 @@ nano -w vpnsetup_centos.sh /bin/sh vpnsetup_centos.sh ``` -If unable to download via `wget`, you may open [vpnsetup.sh](vpnsetup.sh) (or [vpnsetup_centos.sh](vpnsetup_centos.sh)) and click the **`Raw`** button on the right. Press `Ctrl+A` to select all, `Ctrl-C` to copy, then paste into your favorite editor. +If unable to download via `wget`, you may alternatively open [vpnsetup.sh](vpnsetup.sh) (or [vpnsetup_centos.sh](vpnsetup_centos.sh)) and click the **`Raw`** button. Press `Ctrl+A` to select all, `Ctrl-C` to copy, then paste into your favorite editor. ## Next Steps @@ -73,30 +73,30 @@ Enjoy your very own VPN! :sparkles::tada::rocket::sparkles: ## Important Notes -For **Windows users**, a one-time registry change is required if the VPN server and/or client is behind NAT (e.g. home router). Also, make sure that `CHAP` is enabled under "Allow these protocols" in the "Security" tab of VPN connection properties. (Ref) +For **Windows users**, a one-time registry change is required if the VPN server and/or client is behind NAT (e.g. home router). In addition, make sure `CHAP` is enabled under "Allow these protocols" in the "Security" tab of VPN connection properties. -**Android 6 (Marshmallow) users**: After install, edit `/etc/ipsec.conf` and append `,aes256-sha2_256` to both `ike=` and `phase2alg=`. Also add a new line `sha2-truncbug=yes`. Start lines with two spaces. Finally, run `service ipsec restart`. +**Android 6 (Marshmallow) users**: After install, edit `/etc/ipsec.conf` and append `,aes256-sha2_256` to both `ike=` and `phase2alg=`. Then add a new line `sha2-truncbug=yes`. Indent lines with two spaces. Finally, run `service ipsec restart`. -**iPhone/iPad users**: In iOS settings, choose `L2TP` (instead of `IPSec`) for the VPN type. In case you're unable to connect, edit `ipsec.conf` and replace `rightprotoport=17/%any` with `rightprotoport=17/0`. Then restart `ipsec` service. +**iPhone/iPad users**: In iOS settings, choose `L2TP` (instead of `IPSec`) as the VPN type. In case you are unable to connect, edit `ipsec.conf` and replace `rightprotoport=17/%any` with `rightprotoport=17/0`. Then restart `ipsec` service. If you wish to enable multiple VPN users with different credentials, just edit a few lines in the scripts. Clients are configured to use Google Public DNS when the VPN is active. To change, set `ms-dns` in `options.xl2tpd`. -If using Amazon EC2, open these ports in the server's security group: **UDP 500 & 4500**, and **TCP port 22** (optional, for SSH). +If using Amazon EC2, open **UDP ports 500 & 4500** and **TCP port 22** (optional, for SSH) in the instance's security group. -If you configured a custom SSH port or wish to allow other services, edit the IPTables rules in the scripts before using. +If you configured a custom SSH port or wish to allow other services, edit the IPTables rules within the scripts before using. The scripts will backup your existing config files before making changes, to the same folder with `.old-date-time` suffix. ## Upgrading Libreswan -You may use [vpnupgrade_Libreswan.sh](vpnupgrade_Libreswan.sh) (for Ubuntu/Debian) or [vpnupgrade_Libreswan_centos.sh](vpnupgrade_Libreswan_centos.sh) (for CentOS/RHEL) to upgrade Libreswan to a newer version. Check and update the `SWAN_VER` variable on top of the scripts as necessary. +The additional scripts [vpnupgrade_Libreswan.sh](vpnupgrade_Libreswan.sh) and [vpnupgrade_Libreswan_centos.sh](vpnupgrade_Libreswan_centos.sh) can be used to periodically upgrade Libreswan to the latest version. Check the official website and update the `SWAN_VER` variable as necessary. ## Bugs & Questions - Have a question? Please first search other people's comments in this Gist and on my blog. -- For Libreswan related questions, you may ask on the mailing list, or check out the official wiki. +- Ask Libreswan (IPsec) related questions on this mailing list, or check out its official wiki. - If you found a reproducible bug, open a GitHub Issue to submit a bug report. ## Copyright and License