Remove Debian 7

- Remove support for Debian 7 (Wheezy)
- Libreswan 3.21 no longer compiles on Debian 7 or Ubuntu 12.04
- Fix tests by switching to Ubuntu 14.04

.travis.yml

@@ -1,6 +1,7 @@
 language: bash
 
 sudo: required
+dist: trusty
 
 addons:
   apt:

README-zh.md

@@ -66,7 +66,7 @@ wget https://git.io/vpnsetup -O vpnsetup.sh && sudo sh vpnsetup.sh
 
 **-或者-**
 
-一个专用服务器或者虚拟专用服务器 (VPS)，全新安装以上操作系统之一。另外也可使用 Debian 7 (Wheezy)，但是必须首先运行<a href="extras/vpnsetup-debian-7-workaround.sh" target="_blank">另一个脚本</a>。 OpenVZ VPS 不受支持，用户可以尝试使用 <a href="https://shadowsocks.org" target="_blank">Shadowsocks</a> 或者 <a href="https://github.com/Nyr/openvpn-install" target="_blank">OpenVPN</a>。
+一个专用服务器，或者基于 KVM/Xen 的虚拟专用服务器 (VPS)，全新安装以上操作系统之一。OpenVZ VPS 不受支持，用户可以尝试使用比如 <a href="https://shadowsocks.org" target="_blank">Shadowsocks</a> 或者 <a href="https://github.com/Nyr/openvpn-install" target="_blank">OpenVPN</a>。
 
 这也包括各种公共云服务中的 Linux 虚拟机，比如 <a href="https://blog.ls20.com/digitalocean" target="_blank">DigitalOcean</a>, <a href="https://blog.ls20.com/vultr" target="_blank">Vultr</a>, <a href="https://blog.ls20.com/linode" target="_blank">Linode</a>, <a href="https://cloud.google.com/compute/" target="_blank">Google Compute Engine</a>, <a href="https://amazonlightsail.com" target="_blank">Amazon Lightsail</a>, <a href="https://azure.microsoft.com" target="_blank">Microsoft Azure</a>, <a href="http://www.softlayer.com/" target="_blank">IBM SoftLayer</a>, <a href="https://www.ovh.com/us/vps/" target="_blank">OVH</a> 和 <a href="https://www.rackspace.com" target="_blank">Rackspace</a>。
 
@@ -180,10 +180,7 @@ wget https://git.io/vpnupgrade-centos -O vpnupgrade.sh
 - <a href="https://github.com/gaomd/docker-ikev2-vpn-server" target="_blank">IKEv2 VPN Server on Docker</a>
 - <a href="https://github.com/jlund/streisand" target="_blank">Streisand</a>
 - <a href="https://github.com/trailofbits/algo" target="_blank">Algo VPN</a>
-- <a href="https://github.com/SoftEtherVPN/SoftEtherVPN" target="_blank">SoftEther VPN</a>
-- <a href="https://shadowsocks.org" target="_blank">Shadowsocks</a>
 - <a href="https://github.com/Nyr/openvpn-install" target="_blank">OpenVPN Install</a>
-- <a href="https://github.com/philpl/setup-strong-strongswan" target="_blank">Setup strongSwan</a>
 
 ## 授权协议
 

README.md

@@ -66,7 +66,7 @@ Please see <a href="https://blog.ls20.com/ipsec-l2tp-vpn-auto-setup-for-ubuntu-1
 
 **-OR-**
 
-A dedicated server or virtual private server (VPS), freshly installed with one of the above OS. In addition, Debian 7 (Wheezy) can also be used with <a href="extras/vpnsetup-debian-7-workaround.sh" target="_blank">this workaround</a>. OpenVZ VPS is NOT supported, users could instead try <a href="https://github.com/Nyr/openvpn-install" target="_blank">OpenVPN</a>.
+A dedicated server or KVM/Xen-based virtual private server (VPS), freshly installed with one of the above OS. OpenVZ VPS is not supported, users could instead try <a href="https://github.com/Nyr/openvpn-install" target="_blank">OpenVPN</a> or <a href="https://shadowsocks.org" target="_blank">Shadowsocks</a>.
 
 This also includes Linux VMs in public clouds, such as <a href="https://blog.ls20.com/digitalocean" target="_blank">DigitalOcean</a>, <a href="https://blog.ls20.com/vultr" target="_blank">Vultr</a>, <a href="https://blog.ls20.com/linode" target="_blank">Linode</a>, <a href="https://cloud.google.com/compute/" target="_blank">Google Compute Engine</a>, <a href="https://amazonlightsail.com" target="_blank">Amazon Lightsail</a>, <a href="https://azure.microsoft.com" target="_blank">Microsoft Azure</a>, <a href="http://www.softlayer.com/" target="_blank">IBM SoftLayer</a>, <a href="https://www.ovh.com/us/vps/" target="_blank">OVH</a> and <a href="https://www.rackspace.com" target="_blank">Rackspace</a>.
 
@@ -180,10 +180,7 @@ Please refer to <a href="docs/uninstall.md" target="_blank">Uninstall the VPN</a
 - <a href="https://github.com/gaomd/docker-ikev2-vpn-server" target="_blank">IKEv2 VPN Server on Docker</a>
 - <a href="https://github.com/jlund/streisand" target="_blank">Streisand</a>
 - <a href="https://github.com/trailofbits/algo" target="_blank">Algo VPN</a>
-- <a href="https://github.com/SoftEtherVPN/SoftEtherVPN" target="_blank">SoftEther VPN</a>
-- <a href="https://shadowsocks.org" target="_blank">Shadowsocks</a>
 - <a href="https://github.com/Nyr/openvpn-install" target="_blank">OpenVPN Install</a>
-- <a href="https://github.com/philpl/setup-strong-strongswan" target="_blank">Setup strongSwan</a>
 
 ## License
 

extras/vpnsetup-debian-7-workaround.sh

@@ -1,73 +0,0 @@
-#!/bin/sh
-#
-# Debian 7 (Wheezy) does NOT have the required libnss version (>= 3.16) for Libreswan.
-# This script provides a workaround by installing newer packages from libreswan.org.
-# Debian 7 users: Run this script first, before using the VPN setup script.
-#
-# IMPORTANT: These unofficial packages may not receive security updates compared to
-# official Debian packages. They could contain vulnerabilities. Use at your own risk!
-#
-# Copyright (C) 2015-2017 Lin Song <linsongui@gmail.com>
-#
-# This program is free software: you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation, either version 3 of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program. If not, see http://www.gnu.org/licenses/.
-
-export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-
-exiterr() { echo "Error: $1" >&2; exit 1; }
-
-if [ "$(sed 's/\..*//' /etc/debian_version 2>/dev/null)" != "7" ]; then
-  exiterr "This script only supports Debian 7 (Wheezy)."
-fi
-
-if [ "$(uname -m)" != "x86_64" ]; then
-  exiterr "This script only supports 64-bit Debian 7."
-fi
-
-if [ "$(id -u)" != 0 ]; then
-  exiterr "Script must be run as root. Try 'sudo sh $0'"
-fi
-
-# Create and change to working dir
-mkdir -p /opt/src
-cd /opt/src || exiterr "Cannot enter /opt/src."
-
-# Update package index and install wget
-export DEBIAN_FRONTEND=noninteractive
-apt-get -yq update || exiterr "'apt-get update' failed."
-apt-get -yq install wget || exiterr "Failed to install 'wget'."
-
-# Install libnss/libnspr packages from download.libreswan.org.
-# Ref: https://libreswan.org/wiki/3.14_on_Debian_Wheezy
-base_url=https://download.libreswan.org/binaries/debian/wheezy
-
-deb1=libnspr4_4.10.7-1_amd64.deb
-deb2=libnspr4-dev_4.10.7-1_amd64.deb
-deb3=libnss3_3.17.2-1.1_amd64.deb
-deb4=libnss3-dev_3.17.2-1.1_amd64.deb
-deb5=libnss3-tools_3.17.2-1.1_amd64.deb
-
-wget -t 3 -T 30 -nv -O "$deb1" "$base_url/$deb1"
-wget -t 3 -T 30 -nv -O "$deb2" "$base_url/$deb2"
-wget -t 3 -T 30 -nv -O "$deb3" "$base_url/$deb3"
-wget -t 3 -T 30 -nv -O "$deb4" "$base_url/$deb4"
-wget -t 3 -T 30 -nv -O "$deb5" "$base_url/$deb5"
-
-if [ -s "$deb1" ] && [ -s "$deb2" ] && [ -s "$deb3" ] && [ -s "$deb4" ] && [ -s "$deb5" ]; then
-  dpkg -i "$deb1" "$deb2" "$deb3" "$deb4" "$deb5" && /bin/rm -f "$deb1" "$deb2" "$deb3" "$deb4" "$deb5"
-  apt-get install -f
-  echo
-  echo 'Completed! If no error, you may now proceed to run the VPN setup script.'
-  exit 0
-else
-  /bin/rm -f "$deb1" "$deb2" "$deb3" "$deb4" "$deb5"
-  exiterr 'Could not download libnss/libnspr package(s).'
-fi

extras/vpnupgrade.sh

@@ -29,6 +29,10 @@ if ! printf %s "$os_type" | head -n 1 | grep -qiF -e ubuntu -e debian -e raspbia
   exiterr "This script only supports Ubuntu/Debian."
 fi
 
+if [ "$(sed 's/\..*//' /etc/debian_version)" = "7" ]; then
+  exiterr "This script does not support Debian 7 (Wheezy)."
+fi
+
 if [ -f /proc/user_beancounters ]; then
   exiterr "This script does not support OpenVZ VPS."
 fi
@@ -96,15 +100,6 @@ Your other VPN configuration files will not be modified.
 
 EOF
 
-if [ "$(sed 's/\..*//' /etc/debian_version)" = "7" ]; then
-cat <<'EOF'
-IMPORTANT: Workaround required for Debian 7 (Wheezy).
-You must first run the script at: https://git.io/vpndeb7
-Continue only after completing this workaround.
-
-EOF
-fi
-
 printf "Do you wish to continue? [y/N] "
 read -r response
 case $response in

vpnsetup.sh

@@ -55,6 +55,10 @@ if ! printf %s "$os_type" | head -n 1 | grep -qiF -e ubuntu -e debian -e raspbia
   exiterr "This script only supports Ubuntu/Debian."
 fi
 
+if [ "$(sed 's/\..*//' /etc/debian_version)" = "7" ]; then
+  exiterr "This script does not support Debian 7 (Wheezy)."
+fi
+
 if [ -f /proc/user_beancounters ]; then
   echo "Error: This script does not support OpenVZ VPS." >&2
   echo "Try OpenVPN: https://github.com/Nyr/openvpn-install" >&2
@@ -125,18 +129,6 @@ case "$VPN_IPSEC_PSK $VPN_USER $VPN_PASSWORD" in
     ;;
 esac
 
-if [ "$(sed 's/\..*//' /etc/debian_version)" = "7" ]; then
-cat <<'EOF'
-IMPORTANT: Workaround required for Debian 7 (Wheezy).
-You must first run the script at: https://git.io/vpndeb7
-If not already done so, press Ctrl-C to interrupt now.
-
-Continuing in 30 seconds ...
-
-EOF
-  sleep 30
-fi
-
 bigecho "VPN setup in progress... Please be patient."
 
 # Create and change to working dir