Skip to content
Snippets Groups Projects
Commit 3a309978 authored by Ole Voldsæter's avatar Ole Voldsæter
Browse files

Merge branch 'master' into 'routing_minus' 

# Conflicts:
#   src/App.vue
parents 80dadee4 e6f2c36a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
aws/beta.ordbok.uib.no_stack.yaml
+ 5
− 5
View file @ 3a309978
...@@ -3,9 +3,9 @@ AWSTemplateFormatVersion: '2010-09-09' ...@@ -3,9 +3,9 @@ AWSTemplateFormatVersion: '2010-09-09'
Description: > Description: >
Script to create S3 bucket, DNS (Route53) and Cloudfront distribution. Script to create S3 bucket, DNS (Route53) and Cloudfront distribution.
############################################################################### ##############################################################################
Parameters: Parameters:
############################################################################### ##############################################################################
DomainName: DomainName:
Type: String Type: String
...@@ -24,11 +24,11 @@ Parameters: ...@@ -24,11 +24,11 @@ Parameters:
PriceClass: PriceClass:
Type: String Type: String
Description: The CloudFront distribution price class Description: The CloudFront distribution price class
Default: 'PriceClass_100' Default: 'PriceClass_All'
AllowedValues: AllowedValues:
- 'PriceClass_100' - 'PriceClass_100'
#- 'PriceClass_200' - 'PriceClass_200'
#- 'PriceClass_All' - 'PriceClass_All'
CertificateArn: CertificateArn:
Type: String Type: String
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment