Update AWS template

- Send cfn-signal on error, so that stack creation can be cancelled
  earlier without waiting for the timeout
- Other minor improvements
This commit is contained in:
hwdsl2 2020-11-09 00:32:05 -06:00
parent bff8e6cbc8
commit fe01d0aa29

View File

@ -332,6 +332,22 @@
"", "",
[ [
"#!/bin/bash -xe\n", "#!/bin/bash -xe\n",
"trap 'cfn-signal -e 1 ",
" --stack ",
{
"Ref": "AWS::StackName"
},
" --resource VpnInstance ",
" --region ",
{
"Ref": "AWS::Region"
},
"' 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",
"export VPN_IPSEC_PSK='", "export VPN_IPSEC_PSK='",
{ {
"Ref": "VpnIpsecPsk" "Ref": "VpnIpsecPsk"
@ -347,12 +363,10 @@
"Ref": "VpnPassword" "Ref": "VpnPassword"
}, },
"'\n", "'\n",
"sleep 60\n", "wget -t 3 -T 30 -nv -O vpnsetup.sh https://git.io/vpnsetup\n",
"wget https://git.io/vpnsetup -O vpnsetup.sh && sh vpnsetup.sh\n", "sh vpnsetup.sh\n",
"apt-get -yq install python3-pip\n", "cfn-signal -e 0 ",
"pip3 install https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-py3-latest.tar.gz\n", " --stack ",
"cfn-signal ",
"--stack ",
{ {
"Ref": "AWS::StackName" "Ref": "AWS::StackName"
}, },