Skip to content

Commit abc903d

Browse files
authored
Better example objects links and bootstrapping (TechToSpeech#45)
1 parent fad9b66 commit abc903d

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

docs/examples/main.tf

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ module "peterdotcloud_vpc" {
1414
module "peterdotcloud_website" {
1515
source = "TechToSpeech/serverless-static-wordpress/aws"
1616
version = "0.1.2"
17-
main_vpc_id = "vpc-e121c09b"
18-
subnet_ids = ["subnet-04b97235", "subnet-08fb235", "subnet-04b97734"]
17+
main_vpc_id = module.peterdotcloud_vpc.main_vpc_id
18+
subnet_ids = tolist(module.peterdotcloud_vpc.subnet_ids)
1919
aws_account_id = data.aws_caller_identity.current.account_id
2020

2121
# site_name will be used to prepend resource names - use no spaces or special characters
2222
site_name = local.site_name
2323
site_domain = local.site_domain
2424
wordpress_subdomain = "wordpress"
25-
hosted_zone_id = "Z00437553UWAVIRHANGCN"
25+
hosted_zone_id = aws_route53_zone.apex.id
2626
s3_region = local.aws_region
2727
slack_webhook = "https://hooks.slack.com/services/T00000000/B00000000/XXXXXXXXXXXXXXXXXXXXXXXX"
2828
ecs_cpu = 1024
@@ -47,7 +47,7 @@ module "docker_pullpush" {
4747
aws_account_id = data.aws_caller_identity.current.account_id
4848
aws_region = local.aws_region
4949
docker_source = "wordpress:php7.4-apache"
50-
aws_profile = "peterdotcloud"
50+
aws_profile = local.profile
5151
ecr_repo_name = module.peterdotcloud_website.wordpress_ecr_repository
5252
ecr_repo_tag = "base"
5353
depends_on = [module.peterdotcloud_website]
@@ -80,7 +80,7 @@ resource "null_resource" "update_nameservers" {
8080
nameservers = aws_route53_zone.apex.id
8181
}
8282
provisioner "local-exec" {
83-
command = "aws route53domains update-domain-nameservers --region us-east-1 --domain-name ${local.site_domain} --nameservers Name=${aws_route53_zone.apex.name_servers.0} Name=${aws_route53_zone.apex.name_servers.1} Name=${aws_route53_zone.apex.name_servers.2} Name=${aws_route53_zone.apex.name_servers.3} --profile peterdotcloud"
83+
command = "aws route53domains update-domain-nameservers --region us-east-1 --domain-name ${local.site_domain} --nameservers Name=${aws_route53_zone.apex.name_servers.0} Name=${aws_route53_zone.apex.name_servers.1} Name=${aws_route53_zone.apex.name_servers.2} Name=${aws_route53_zone.apex.name_servers.3} --profile ${local.profile}"
8484
}
8585
depends_on = [aws_route53_zone.apex]
8686
}

docs/examples/vpc_setup/vpc.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,14 @@ resource "aws_route_table" "main_private" {
8989
}
9090

9191
resource "aws_route_table_association" "main_subnets_public" {
92-
count = length(data.aws_subnet_ids.main_public.ids)
93-
subnet_id = tolist(data.aws_subnet_ids.main_public.ids)[count.index]
92+
count = length(data.aws_subnet_ids.main_public) > 0 ? length(data.aws_subnet_ids.main_public) : 0
93+
subnet_id = element(aws_subnet.main_public.*.id, count.index)
9494
route_table_id = aws_route_table.main_public.id
9595
}
9696

9797
resource "aws_route_table_association" "main_subnets_private" {
98-
count = length(data.aws_subnet_ids.main_private.ids)
99-
subnet_id = tolist(data.aws_subnet_ids.main_private.ids)[count.index]
98+
count = length(data.aws_subnet_ids.main_private) > 0 ? length(data.aws_subnet_ids.main_private) : 0
99+
subnet_id = element(aws_subnet.main_private.*.id, count.index)
100100
route_table_id = aws_route_table.main_private.id
101101
}
102102

0 commit comments

Comments
 (0)