Update templates

- Update the AWS and Azure deployment template or script to use
  the VPN quick start script instead of vpnsetup.sh. The quick
  start script sets up IKEv2 automatically, so users don't need
  to manually set up IKEv2.

aws/cloudformation-template-ipsec.json

@@ -387,7 +387,7 @@
                                     "Ref": "VpnPassword"
                                 },
                                 "'\n",
-                                "wget -t 3 -T 30 -nv -O vpn.sh https://git.io/vpnsetup\n",
+                                "wget -t 3 -T 30 -nv -O vpn.sh https://git.io/vpnstart\n",
                                 "sh vpn.sh\n",
                                 "cfn-signal -e 0 ",
                                 " --stack ",

azure/install.sh

@@ -4,7 +4,4 @@ export VPN_IPSEC_PSK=$1
 export VPN_USER=$2
 export VPN_PASSWORD=$3
 
-# Wait 60 seconds for apt/dpkg lock
-sleep 60
-
-wget https://git.io/vpnsetup -O vpn.sh && sh vpn.sh
+wget -t 3 -T 30 -nv -O vpn.sh https://git.io/vpnstart && sh vpn.sh