diff --git a/aws/beta.ordbok.uib.no_stack.yaml b/aws/beta.ordbok.uib.no_stack.yaml index 6a36d0e156760de96a9b1a11ddbff0541231c8f2..fcb830ab1dc9bab67652ddcd4446cc447d36b212 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