From 56078b0a1ef7ed8f5a2606b5777540f26f96e2a9 Mon Sep 17 00:00:00 2001 From: hwdsl2 Date: Sat, 27 Aug 2022 15:59:43 -0500 Subject: [PATCH] Add an option to skip IKEv2 setup - Add an option to skip IKEv2 setup when installing the IPsec VPN. Example: sudo VPN_SKIP_IKEV2=yes sh vpn.sh - This allows users to set up an IKEv1-only VPN, or install IKEv2 interactively using "sudo ikev2.sh" after VPN setup. --- extras/quickstart.sh | 1 + vpnsetup.sh | 1 + vpnsetup_alpine.sh | 20 ++++++++++++++------ vpnsetup_amzn.sh | 20 ++++++++++++++------ vpnsetup_centos.sh | 20 ++++++++++++++------ vpnsetup_ubuntu.sh | 20 ++++++++++++++------ 6 files changed, 58 insertions(+), 24 deletions(-) diff --git a/extras/quickstart.sh b/extras/quickstart.sh index 885142c..eced71e 100755 --- a/extras/quickstart.sh +++ b/extras/quickstart.sh @@ -273,6 +273,7 @@ run_setup() { VPN_DNS_SRV1="$VPN_DNS_SRV1" VPN_DNS_SRV2="$VPN_DNS_SRV2" \ VPN_DNS_NAME="$VPN_DNS_NAME" VPN_CLIENT_NAME="$VPN_CLIENT_NAME" \ VPN_PROTECT_CONFIG="$VPN_PROTECT_CONFIG" \ + VPN_SKIP_IKEV2="$VPN_SKIP_IKEV2" \ /bin/bash "$tmpdir/vpn.sh" || status=1 else status=1 diff --git a/vpnsetup.sh b/vpnsetup.sh index 885142c..eced71e 100755 --- a/vpnsetup.sh +++ b/vpnsetup.sh @@ -273,6 +273,7 @@ run_setup() { VPN_DNS_SRV1="$VPN_DNS_SRV1" VPN_DNS_SRV2="$VPN_DNS_SRV2" \ VPN_DNS_NAME="$VPN_DNS_NAME" VPN_CLIENT_NAME="$VPN_CLIENT_NAME" \ VPN_PROTECT_CONFIG="$VPN_PROTECT_CONFIG" \ + VPN_SKIP_IKEV2="$VPN_SKIP_IKEV2" \ /bin/bash "$tmpdir/vpn.sh" || status=1 else status=1 diff --git a/vpnsetup_alpine.sh b/vpnsetup_alpine.sh index 53e1826..0b1b043 100755 --- a/vpnsetup_alpine.sh +++ b/vpnsetup_alpine.sh @@ -538,12 +538,20 @@ EOF set_up_ikev2() { status=0 if [ -s /opt/src/ikev2.sh ] && [ ! -f /etc/ipsec.d/ikev2.conf ]; then - sleep 1 - VPN_DNS_NAME="$VPN_DNS_NAME" VPN_PUBLIC_IP="$public_ip" \ - VPN_CLIENT_NAME="$VPN_CLIENT_NAME" VPN_XAUTH_POOL="$VPN_XAUTH_POOL" \ - VPN_DNS_SRV1="$VPN_DNS_SRV1" VPN_DNS_SRV2="$VPN_DNS_SRV2" \ - VPN_PROTECT_CONFIG="$VPN_PROTECT_CONFIG" \ - /bin/bash /opt/src/ikev2.sh --auto || status=1 + skip_ikev2=0 + case $VPN_SKIP_IKEV2 in + [yY][eE][sS]) + skip_ikev2=1 + ;; + esac + if [ "$skip_ikev2" = "0" ]; then + sleep 1 + VPN_DNS_NAME="$VPN_DNS_NAME" VPN_PUBLIC_IP="$public_ip" \ + VPN_CLIENT_NAME="$VPN_CLIENT_NAME" VPN_XAUTH_POOL="$VPN_XAUTH_POOL" \ + VPN_DNS_SRV1="$VPN_DNS_SRV1" VPN_DNS_SRV2="$VPN_DNS_SRV2" \ + VPN_PROTECT_CONFIG="$VPN_PROTECT_CONFIG" \ + /bin/bash /opt/src/ikev2.sh --auto || status=1 + fi elif [ -s /opt/src/ikev2.sh ]; then cat <<'EOF' ================================================ diff --git a/vpnsetup_amzn.sh b/vpnsetup_amzn.sh index dc7dadc..b46e19e 100755 --- a/vpnsetup_amzn.sh +++ b/vpnsetup_amzn.sh @@ -554,12 +554,20 @@ EOF set_up_ikev2() { status=0 if [ -s /opt/src/ikev2.sh ] && [ ! -f /etc/ipsec.d/ikev2.conf ]; then - sleep 1 - VPN_DNS_NAME="$VPN_DNS_NAME" VPN_PUBLIC_IP="$public_ip" \ - VPN_CLIENT_NAME="$VPN_CLIENT_NAME" VPN_XAUTH_POOL="$VPN_XAUTH_POOL" \ - VPN_DNS_SRV1="$VPN_DNS_SRV1" VPN_DNS_SRV2="$VPN_DNS_SRV2" \ - VPN_PROTECT_CONFIG="$VPN_PROTECT_CONFIG" \ - /bin/bash /opt/src/ikev2.sh --auto || status=1 + skip_ikev2=0 + case $VPN_SKIP_IKEV2 in + [yY][eE][sS]) + skip_ikev2=1 + ;; + esac + if [ "$skip_ikev2" = "0" ]; then + sleep 1 + VPN_DNS_NAME="$VPN_DNS_NAME" VPN_PUBLIC_IP="$public_ip" \ + VPN_CLIENT_NAME="$VPN_CLIENT_NAME" VPN_XAUTH_POOL="$VPN_XAUTH_POOL" \ + VPN_DNS_SRV1="$VPN_DNS_SRV1" VPN_DNS_SRV2="$VPN_DNS_SRV2" \ + VPN_PROTECT_CONFIG="$VPN_PROTECT_CONFIG" \ + /bin/bash /opt/src/ikev2.sh --auto || status=1 + fi elif [ -s /opt/src/ikev2.sh ]; then cat <<'EOF' ================================================ diff --git a/vpnsetup_centos.sh b/vpnsetup_centos.sh index b32f5c9..eff421a 100755 --- a/vpnsetup_centos.sh +++ b/vpnsetup_centos.sh @@ -714,12 +714,20 @@ EOF set_up_ikev2() { status=0 if [ -s /opt/src/ikev2.sh ] && [ ! -f /etc/ipsec.d/ikev2.conf ]; then - sleep 1 - VPN_DNS_NAME="$VPN_DNS_NAME" VPN_PUBLIC_IP="$public_ip" \ - VPN_CLIENT_NAME="$VPN_CLIENT_NAME" VPN_XAUTH_POOL="$VPN_XAUTH_POOL" \ - VPN_DNS_SRV1="$VPN_DNS_SRV1" VPN_DNS_SRV2="$VPN_DNS_SRV2" \ - VPN_PROTECT_CONFIG="$VPN_PROTECT_CONFIG" \ - /bin/bash /opt/src/ikev2.sh --auto || status=1 + skip_ikev2=0 + case $VPN_SKIP_IKEV2 in + [yY][eE][sS]) + skip_ikev2=1 + ;; + esac + if [ "$skip_ikev2" = "0" ]; then + sleep 1 + VPN_DNS_NAME="$VPN_DNS_NAME" VPN_PUBLIC_IP="$public_ip" \ + VPN_CLIENT_NAME="$VPN_CLIENT_NAME" VPN_XAUTH_POOL="$VPN_XAUTH_POOL" \ + VPN_DNS_SRV1="$VPN_DNS_SRV1" VPN_DNS_SRV2="$VPN_DNS_SRV2" \ + VPN_PROTECT_CONFIG="$VPN_PROTECT_CONFIG" \ + /bin/bash /opt/src/ikev2.sh --auto || status=1 + fi elif [ -s /opt/src/ikev2.sh ]; then cat <<'EOF' ================================================ diff --git a/vpnsetup_ubuntu.sh b/vpnsetup_ubuntu.sh index 3b9f798..3f8da84 100755 --- a/vpnsetup_ubuntu.sh +++ b/vpnsetup_ubuntu.sh @@ -664,12 +664,20 @@ EOF set_up_ikev2() { status=0 if [ -s /opt/src/ikev2.sh ] && [ ! -f /etc/ipsec.d/ikev2.conf ]; then - sleep 1 - VPN_DNS_NAME="$VPN_DNS_NAME" VPN_PUBLIC_IP="$public_ip" \ - VPN_CLIENT_NAME="$VPN_CLIENT_NAME" VPN_XAUTH_POOL="$VPN_XAUTH_POOL" \ - VPN_DNS_SRV1="$VPN_DNS_SRV1" VPN_DNS_SRV2="$VPN_DNS_SRV2" \ - VPN_PROTECT_CONFIG="$VPN_PROTECT_CONFIG" \ - /bin/bash /opt/src/ikev2.sh --auto || status=1 + skip_ikev2=0 + case $VPN_SKIP_IKEV2 in + [yY][eE][sS]) + skip_ikev2=1 + ;; + esac + if [ "$skip_ikev2" = "0" ]; then + sleep 1 + VPN_DNS_NAME="$VPN_DNS_NAME" VPN_PUBLIC_IP="$public_ip" \ + VPN_CLIENT_NAME="$VPN_CLIENT_NAME" VPN_XAUTH_POOL="$VPN_XAUTH_POOL" \ + VPN_DNS_SRV1="$VPN_DNS_SRV1" VPN_DNS_SRV2="$VPN_DNS_SRV2" \ + VPN_PROTECT_CONFIG="$VPN_PROTECT_CONFIG" \ + /bin/bash /opt/src/ikev2.sh --auto || status=1 + fi elif [ -s /opt/src/ikev2.sh ]; then cat <<'EOF' ================================================