From d909b986cfdfa2ad08b662960f1c40b35e90e936 Mon Sep 17 00:00:00 2001 From: Lin Song Date: Wed, 6 Apr 2016 02:51:37 -0500 Subject: [PATCH] Add support for Ubuntu 16.04 (Xenial) --- README.md | 10 +++++----- vpnsetup.sh | 6 +++++- vpnsetup_centos.sh | 6 +++++- vpnupgrade_Libreswan.sh | 4 ++++ vpnupgrade_Libreswan_centos.sh | 4 ++++ 5 files changed, 23 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index ac17050..5c35612 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # IPsec/L2TP VPN Server Auto Setup Scripts -Scripts for automatic configuration of IPsec/L2TP VPN server on Ubuntu 14.04 & 12.04, Debian 8 and CentOS/RHEL 6 & 7. All you need to do is providing your own values for `IPSEC_PSK`, `VPN_USER` and `VPN_PASSWORD`, and let them handle the rest. +Scripts for automatic configuration of an IPsec/L2TP VPN server on Ubuntu 16.04/14.04/12.04, Debian 8 and CentOS 6 & 7. All you need to do is providing your own values for `IPSEC_PSK`, `VPN_USER` and `VPN_PASSWORD`, and let them handle the rest. We will use Libreswan as the IPsec server, and xl2tpd as the L2TP provider. @@ -32,13 +32,13 @@ View my profile on LinkedIn at Amazon EC2 instance, using these AMIs: (See instructions) -- Ubuntu 14.04 (Trusty) or 12.04 (Precise) -- Debian 8 (Jessie) EC2 Images +- Ubuntu 16.04 (Xenial), 14.04 (Trusty) or 12.04 (Precise) +- Debian 8 (Jessie) EC2 Images - CentOS 7 (x86_64) with Updates HVM - CentOS 6 (x86_64) with Updates HVM @@ -46,7 +46,7 @@ A newly created Amazon EC2 A dedicated server or KVM/Xen-based Virtual Private Server (VPS), with the following OS:  (Note: Starting with a freshly installed system is recommended) -- Ubuntu 14.04 (Trusty) or 12.04 (Precise) +- Ubuntu 16.04 (Xenial), 14.04 (Trusty) or 12.04 (Precise) - Debian 8 (Jessie) - Debian 7 (Wheezy) » Not recommended. Requires this workaround to work. - CentOS / Red Hat Enterprise Linux (RHEL) 6 or 7 diff --git a/vpnsetup.sh b/vpnsetup.sh index 8c760be..55f5ea2 100644 --- a/vpnsetup.sh +++ b/vpnsetup.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Script for automatic configuration of IPsec/L2TP VPN server on Ubuntu 14.04/12.04 and Debian 8. +# Script for automatic setup of an IPsec/L2TP VPN server on Ubuntu LTS and Debian 8. # Works on dedicated servers and any KVM- or Xen-based Virtual Private Server (VPS). # It can also be used as Amazon EC2 "user-data" with the official Ubuntu or Debian AMIs. # @@ -124,6 +124,10 @@ wget -t 3 -T 30 -nv -O "$SWAN_FILE" "$SWAN_URL" /bin/rm -rf "/opt/src/libreswan-$SWAN_VER" tar xvzf "$SWAN_FILE" && rm -f "$SWAN_FILE" cd "libreswan-$SWAN_VER" || { echo "Failed to enter Libreswan source dir. Aborting."; exit 1; } +# Workaround for Libreswan compile issues +cat > Makefile.inc.local < Makefile.inc.local < Makefile.inc.local < Makefile.inc.local <