From 72237c8e56257fbd9ec06da060912a055e4a38d3 Mon Sep 17 00:00:00 2001
From: hwdsl2 <hwdsl2@users.noreply.github.com>
Date: Sat, 7 Nov 2020 14:55:02 -0600
Subject: [PATCH] Update AWS template

- Increased timeout to 15 mins
- Exit script on command failures using bash "-e" flag
- Update docs
---
 aws/README-zh.md                  | 2 +-
 aws/README.md                     | 2 +-
 aws/cloudformation-template-ipsec | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/aws/README-zh.md b/aws/README-zh.md
index cacac0b..080c11a 100644
--- a/aws/README-zh.md
+++ b/aws/README-zh.md
@@ -31,7 +31,7 @@
 
 <a href="https://console.aws.amazon.com/cloudformation/home#/stacks/new" target="_blank"><img src="cloudformation-launch-stack-button.png" alt="Launch stack" height="34px"></a>
 
-要指定一个 AWS 区域，你可以使用导航栏上你的帐户信息右侧的选择器。一但堆栈的部署状态变成 **"CREATE_COMPLETE"** ，你就可以连接到服务器了。单击 **Outputs** 选项卡以查看你的 VPN 登录信息，然后继续下一步：[配置 VPN 客户端](../README-zh.md#下一步)。
+要指定一个 AWS 区域，你可以使用导航栏上你的帐户信息右侧的选择器。当你在最后一步中点击 "create stack" 之后，请等待堆栈创建和 VPN 安装完成，可能需要最多 15 分钟。一旦堆栈的部署状态变成 **"CREATE_COMPLETE"** ，你就可以连接到 VPN 服务器了。单击 **Outputs** 选项卡以查看你的 VPN 登录信息，然后继续下一步：[配置 VPN 客户端](../README-zh.md#下一步)。
 
 ## 常见问题
 
diff --git a/aws/README.md b/aws/README.md
index 9bd7293..170b346 100644
--- a/aws/README.md
+++ b/aws/README.md
@@ -31,7 +31,7 @@ Click the icon below to start:
 
 <a href="https://console.aws.amazon.com/cloudformation/home#/stacks/new" target="_blank"><img src="cloudformation-launch-stack-button.png" alt="Launch stack" height="34px"></a>
 
-You may choose an AWS region using the selector to the right of your account information on the navigation bar. As soon as the stack's status turns **"CREATE_COMPLETE"**, you are ready to connect to the VPN server. Click the **Outputs** tab to view your VPN login details. Then continue to [Next steps: Configure VPN Clients](../README.md#next-steps).
+You may choose an AWS region using the selector to the right of your account information on the navigation bar. After you click "create stack" in the final step, please wait for the stack creation and VPN setup to complete, which may take up to 15 minutes. As soon as the stack's status changes to **"CREATE_COMPLETE"**, you are ready to connect to the VPN server. Click the **Outputs** tab to view your VPN login details. Then continue to [Next steps: Configure VPN Clients](../README.md#next-steps).
 
 ## FAQs
 
diff --git a/aws/cloudformation-template-ipsec b/aws/cloudformation-template-ipsec
index 1a488d0..819009a 100644
--- a/aws/cloudformation-template-ipsec
+++ b/aws/cloudformation-template-ipsec
@@ -322,7 +322,7 @@
             "Type": "AWS::EC2::Instance",
             "CreationPolicy": {
                 "ResourceSignal": {
-                    "Timeout": "PT10M"
+                    "Timeout": "PT15M"
                 }
             },
             "Properties": {
@@ -331,7 +331,7 @@
                         "Fn::Join": [
                             "",
                             [
-                                "#!/bin/bash -x\n",
+                                "#!/bin/bash -xe\n",
                                 "export VPN_IPSEC_PSK='",
                                 {
                                     "Ref": "VpnIpsecPsk"
@@ -349,7 +349,7 @@
                                 "'\n",
                                 "sleep 60\n",
                                 "wget https://git.io/vpnsetup -O vpnsetup.sh && sh vpnsetup.sh\n",
-                                "apt-get install python3-pip -y\n",
+                                "apt-get -yq install python3-pip\n",
                                 "pip3 install https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-py3-latest.tar.gz\n",
                                 "cfn-signal ",
                                 "--stack ",