From 2828ceb97d7b50ed0643d87636d09fc87a568175 Mon Sep 17 00:00:00 2001 From: Scottpedia Date: Fri, 1 Jan 2021 19:25:29 -0500 Subject: [PATCH] Update the user-data script. - Extract the os-specific commands to install python3 and helper scripts from the mapping-data. - Extract the OS-specific installation links for VPN softwares from the mapping data. --- aws/cloudformation-template-ipsec | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/aws/cloudformation-template-ipsec b/aws/cloudformation-template-ipsec index d979995..d17dba5 100644 --- a/aws/cloudformation-template-ipsec +++ b/aws/cloudformation-template-ipsec @@ -349,10 +349,15 @@ }, "' ERR\n", "sleep 60\n", - "export DEBIAN_FRONTEND=noninteractive\n", - "apt-get -yq update\n", - "apt-get -yq install python3-pip\n", - "pip3 install https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-py3-latest.tar.gz\n", + { + "Fn::FindInMap": [ + "OS", + { + "Ref": "OS" + }, + "HelperInstallationCommands" + ] + }, "export VPN_IPSEC_PSK='", { "Ref": "VpnIpsecPsk" @@ -368,7 +373,17 @@ "Ref": "VpnPassword" }, "'\n", - "wget -t 3 -T 30 -nv -O vpnsetup.sh https://git.io/vpnsetup\n", + "wget -t 3 -T 30 -nv -O vpnsetup.sh ", + { + "Fn::FindInMap": [ + "OS", + { + "Ref": "OS" + }, + "InstallationLinks" + ] + }, + "\n", "sh vpnsetup.sh\n", "cfn-signal -e 0 ", " --stack ",