From e390b56505659b522ae0d48e7dc7c0c42848b0a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole=20Volds=C3=A6ter?= <ole.voldsater@uib.no>
Date: Thu, 13 Feb 2020 09:04:25 +0100
Subject: [PATCH] fikset siste problemer (dns-navn og fast hosted zone for
cloudfront)
---
aws/beta.ordbok.uib.no_stack.yaml | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/aws/beta.ordbok.uib.no_stack.yaml b/aws/beta.ordbok.uib.no_stack.yaml
index 6a36d0e1..fcb830ab 100644
--- a/aws/beta.ordbok.uib.no_stack.yaml
+++ b/aws/beta.ordbok.uib.no_stack.yaml
@@ -10,7 +10,7 @@ Parameters:
DomainName:
Type: String
Description: The domain name.
- Default: 'beta.ordbok.aws.uib.no.'
+ Default: 'beta.ordbok.aws.uib.no'
AllowedPattern: (?!-)[a-zA-Z0-9-.]{1,63}(?<!-)
ConstraintDescription: must be a valid DNS zone name
@@ -27,10 +27,6 @@ Parameters:
Type: String
Default: ''
- HostedZone:
- Type: String
- Default: Z2YZQI8X816BZS
-
###############################################################################
Resources:
@@ -39,11 +35,11 @@ Resources:
DNS:
Type: "AWS::Route53::RecordSet"
Properties:
- HostedZoneName: !Ref DomainName
+ HostedZoneName: !Sub "${DomainName}."
Name: !Ref DomainName
Type: A
AliasTarget:
- HostedZoneId: !Ref HostedZone
+ HostedZoneId: Z2FDTNDATAQYW2
DNSName: !GetAtt Distribution.DomainName
WebBucket:
@@ -67,7 +63,7 @@ Resources:
Statement:
- Sid: PublicReadForGetBucketObjects
Effect: Allow
- Action: s3:GetObject
+ Action: s3:*
Resource: !Join ['', ['arn:aws:s3:::', !Ref 'WebBucket', /*]]
Principal:
CanonicalUser: !GetAtt CloudFrontOriginIdentity.S3CanonicalUserId
--
GitLab