Skip to content

Commit 12467ff

Browse files
author
Alan Clucas
committed
Common up cloudflare and route53 as much as possible
1 parent d09802c commit 12467ff

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

31 files changed

+687
-1304
lines changed

terraform/aws_cloudflare/certificates.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ resource "aws_acm_certificate" "lb" {
66
}
77

88
data "cloudflare_zone" "zone" {
9-
name = var.cloudflare_zone
9+
name = var.dns_zone
1010
}
1111

1212
resource "cloudflare_record" "lb_validate" {

terraform/aws_cloudflare/common.tf

-137
This file was deleted.

terraform/aws_cloudflare/common.tf

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../aws_common/common.tf

terraform/aws_cloudflare/database.tf

-50
This file was deleted.

terraform/aws_cloudflare/database.tf

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../aws_common/database.tf

terraform/aws_cloudflare/dns.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ resource "cloudflare_record" "lb" {
99

1010
resource "cloudflare_record" "hub" {
1111
zone_id = data.cloudflare_zone.zone.id
12-
name = "hubvm.${var.prefix}.${var.cloudflare_zone}"
12+
name = "hubvm.${var.prefix}.${var.dns_zone}"
1313
value = "${aws_instance.hub.private_ip}"
1414
type = "A"
1515
}
1616

1717
resource "cloudflare_record" "worker" {
1818
count = var.worker_vm_count
1919
zone_id = data.cloudflare_zone.zone.id
20-
name = "worker${count.index}.${var.prefix}.${var.cloudflare_zone}"
20+
name = "worker${count.index}.${var.prefix}.${var.dns_zone}"
2121
value = "${aws_instance.worker[count.index].private_ip}"
2222
type = "A"
2323
}

terraform/aws_cloudflare/efs.tf

-42
This file was deleted.

terraform/aws_cloudflare/efs.tf

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../aws_common/efs.tf

terraform/aws_cloudflare/hosts.tpl

-21
This file was deleted.

terraform/aws_cloudflare/hosts.tpl

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../aws_common/hosts.tpl

0 commit comments

Comments
 (0)