From a82fba55f8cf7d83c274160e40ba79fc950cf51e Mon Sep 17 00:00:00 2001
From: Sergej Jevsejev <sjevsejev@gmail.com>
Date: Sun, 9 Apr 2017 21:25:07 +0200
Subject: [PATCH] added ACM certificate

---
 s3-static-website-with-cloudfront-and-route-53.yaml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/s3-static-website-with-cloudfront-and-route-53.yaml b/s3-static-website-with-cloudfront-and-route-53.yaml
index a7cde20..c4511ae 100644
--- a/s3-static-website-with-cloudfront-and-route-53.yaml
+++ b/s3-static-website-with-cloudfront-and-route-53.yaml
@@ -12,6 +12,10 @@ Parameters:
     Description: The full domain name e.g. www.jevsejev.io
     AllowedPattern: (?!-)[a-zA-Z0-9-.]{1,63}(?<!-)
     ConstraintDescription: must be a valid DNS zone name.
+  AcmCertificateArn:
+    Type: String
+    Description: the Amazon Resource Name (ARN) of an AWS Certificate Manager (ACM) certificate.
+    AllowedPattern: "arn:aws:acm:.*"
 Mappings:
   RegionMap:
     us-east-1:
@@ -89,10 +93,11 @@ Resources:
             QueryString: true
             Cookies:
               Forward: none
-          ViewerProtocolPolicy: https-only
+          ViewerProtocolPolicy: redirect-to-https
         PriceClass: PriceClass_All
         ViewerCertificate:
-          CloudFrontDefaultCertificate: 'true'
+          AcmCertificateArn: !Ref AcmCertificateArn
+          SslSupportMethod: sni-only
   WebsiteDNSName:
     Type: AWS::Route53::RecordSetGroup
     Properties: