From 520a02aa0cb03a812edd086407e7587f5f769437 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Wed, 20 Dec 2023 10:05:35 +0200 Subject: refactor --- org-buetow-ecs/remotestate.tf | 17 ----------------- org-buetow-ecs/remotestates.tf | 17 +++++++++++++++++ org-buetow-elb/remotestate.tf | 8 -------- org-buetow-elb/remotestates.tf | 8 ++++++++ org-buetow-helper/main.tf | 10 +++++----- org-buetow-helper/remotestate.tf | 8 -------- org-buetow-helper/remotestates.tf | 8 ++++++++ org-buetow-nextcloud/remotestate.tf | 17 ----------------- org-buetow-nextcloud/remotestates.tf | 17 +++++++++++++++++ 9 files changed, 55 insertions(+), 55 deletions(-) delete mode 100644 org-buetow-ecs/remotestate.tf create mode 100644 org-buetow-ecs/remotestates.tf delete mode 100644 org-buetow-elb/remotestate.tf create mode 100644 org-buetow-elb/remotestates.tf delete mode 100644 org-buetow-helper/remotestate.tf create mode 100644 org-buetow-helper/remotestates.tf delete mode 100644 org-buetow-nextcloud/remotestate.tf create mode 100644 org-buetow-nextcloud/remotestates.tf diff --git a/org-buetow-ecs/remotestate.tf b/org-buetow-ecs/remotestate.tf deleted file mode 100644 index db9b321..0000000 --- a/org-buetow-ecs/remotestate.tf +++ /dev/null @@ -1,17 +0,0 @@ -data "terraform_remote_state" "base" { - backend = "s3" - config = { - bucket = "org-buetow-tfstate" - key = "org-buetow-base/terraform.tfstate" - region = "eu-central-1" - } -} - -data "terraform_remote_state" "elb" { - backend = "s3" - config = { - bucket = "org-buetow-tfstate" - key = "org-buetow-elb/terraform.tfstate" - region = "eu-central-1" - } -} diff --git a/org-buetow-ecs/remotestates.tf b/org-buetow-ecs/remotestates.tf new file mode 100644 index 0000000..db9b321 --- /dev/null +++ b/org-buetow-ecs/remotestates.tf @@ -0,0 +1,17 @@ +data "terraform_remote_state" "base" { + backend = "s3" + config = { + bucket = "org-buetow-tfstate" + key = "org-buetow-base/terraform.tfstate" + region = "eu-central-1" + } +} + +data "terraform_remote_state" "elb" { + backend = "s3" + config = { + bucket = "org-buetow-tfstate" + key = "org-buetow-elb/terraform.tfstate" + region = "eu-central-1" + } +} diff --git a/org-buetow-elb/remotestate.tf b/org-buetow-elb/remotestate.tf deleted file mode 100644 index b66c16f..0000000 --- a/org-buetow-elb/remotestate.tf +++ /dev/null @@ -1,8 +0,0 @@ -data "terraform_remote_state" "base" { - backend = "s3" - config = { - bucket = "org-buetow-tfstate" - key = "org-buetow-base/terraform.tfstate" - region = "eu-central-1" - } -} diff --git a/org-buetow-elb/remotestates.tf b/org-buetow-elb/remotestates.tf new file mode 100644 index 0000000..b66c16f --- /dev/null +++ b/org-buetow-elb/remotestates.tf @@ -0,0 +1,8 @@ +data "terraform_remote_state" "base" { + backend = "s3" + config = { + bucket = "org-buetow-tfstate" + key = "org-buetow-base/terraform.tfstate" + region = "eu-central-1" + } +} diff --git a/org-buetow-helper/main.tf b/org-buetow-helper/main.tf index ec1c32d..65018b1 100644 --- a/org-buetow-helper/main.tf +++ b/org-buetow-helper/main.tf @@ -41,7 +41,7 @@ resource "aws_key_pair" "id_rsa_pub" { public_key = file("${path.module}/id_rsa.pub") } -resource "aws_instance" "my_bastion_instance" { +resource "aws_instance" "bastion_instance" { ami = data.aws_ami.amazon_linux.id instance_type = "t2.micro" key_name = aws_key_pair.id_rsa_pub.key_name @@ -59,14 +59,14 @@ resource "aws_instance" "my_bastion_instance" { } } -data "aws_route53_zone" "my_zone" { +data "aws_route53_zone" "zone" { name = "aws.buetow.org." # Replace with your domain name } -resource "aws_route53_record" "my_record" { - zone_id = data.aws_route53_zone.my_zone.zone_id +resource "aws_route53_record" "record" { + zone_id = data.aws_route53_zone.zone.zone_id name = "bastion.aws.buetow.org" # Replace with your desired subdomain or leave empty for root type = "A" ttl = "300" - records = [aws_instance.my_bastion_instance.public_ip] + records = [aws_instance.bastion_instance.public_ip] } diff --git a/org-buetow-helper/remotestate.tf b/org-buetow-helper/remotestate.tf deleted file mode 100644 index 523dca5..0000000 --- a/org-buetow-helper/remotestate.tf +++ /dev/null @@ -1,8 +0,0 @@ -data "terraform_remote_state" "base_remote_state" { - backend = "s3" - config = { - bucket = "org-buetow-tfstate" - key = "org-buetow-base/terraform.tfstate" - region = "eu-central-1" - } -} diff --git a/org-buetow-helper/remotestates.tf b/org-buetow-helper/remotestates.tf new file mode 100644 index 0000000..523dca5 --- /dev/null +++ b/org-buetow-helper/remotestates.tf @@ -0,0 +1,8 @@ +data "terraform_remote_state" "base_remote_state" { + backend = "s3" + config = { + bucket = "org-buetow-tfstate" + key = "org-buetow-base/terraform.tfstate" + region = "eu-central-1" + } +} diff --git a/org-buetow-nextcloud/remotestate.tf b/org-buetow-nextcloud/remotestate.tf deleted file mode 100644 index db9b321..0000000 --- a/org-buetow-nextcloud/remotestate.tf +++ /dev/null @@ -1,17 +0,0 @@ -data "terraform_remote_state" "base" { - backend = "s3" - config = { - bucket = "org-buetow-tfstate" - key = "org-buetow-base/terraform.tfstate" - region = "eu-central-1" - } -} - -data "terraform_remote_state" "elb" { - backend = "s3" - config = { - bucket = "org-buetow-tfstate" - key = "org-buetow-elb/terraform.tfstate" - region = "eu-central-1" - } -} diff --git a/org-buetow-nextcloud/remotestates.tf b/org-buetow-nextcloud/remotestates.tf new file mode 100644 index 0000000..db9b321 --- /dev/null +++ b/org-buetow-nextcloud/remotestates.tf @@ -0,0 +1,17 @@ +data "terraform_remote_state" "base" { + backend = "s3" + config = { + bucket = "org-buetow-tfstate" + key = "org-buetow-base/terraform.tfstate" + region = "eu-central-1" + } +} + +data "terraform_remote_state" "elb" { + backend = "s3" + config = { + bucket = "org-buetow-tfstate" + key = "org-buetow-elb/terraform.tfstate" + region = "eu-central-1" + } +} -- cgit v1.2.3