From 999bddddc8354c5665c660290b99e1cf446edb2f Mon Sep 17 00:00:00 2001
From: Paul Buetow <paul@buetow.org>
Date: Wed, 20 Dec 2023 10:01:54 +0200
Subject: fix

---
 org-buetow-nextcloud/main.tf        | 16 ++++++----------
 org-buetow-nextcloud/remotestate.tf | 11 ++++++++++-
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/org-buetow-nextcloud/main.tf b/org-buetow-nextcloud/main.tf
index 60bd50e..f07ae15 100644
--- a/org-buetow-nextcloud/main.tf
+++ b/org-buetow-nextcloud/main.tf
@@ -18,7 +18,7 @@ data "template_file" "user_data" {
 
   vars = {
     region = data.aws_region.current.name
-    efs_id = data.terraform_remote_state.base_remote_state.outputs.my_self_hosted_services_efs_id
+    efs_id = data.terraform_remote_state.base.outputs.my_self_hosted_services_efs_id
   }
 }
 
@@ -45,12 +45,12 @@ resource "aws_instance" "my_nextcloud_instance" {
   ami           = data.aws_ami.amazon_linux.id
   instance_type = "t2.medium"
   key_name      = aws_key_pair.id_rsa_pub.key_name
-  subnet_id     = data.terraform_remote_state.base_remote_state.outputs.my_public_subnet_a_id
+  subnet_id     = data.terraform_remote_state.base.outputs.my_public_subnet_a_id
 
   vpc_security_group_ids = [
-    data.terraform_remote_state.base_remote_state.outputs.allow_ssh_sg_id,
-    data.terraform_remote_state.base_remote_state.outputs.allow_web_sg_id,
-    data.terraform_remote_state.base_remote_state.outputs.allow_outbound_sg_id,
+    data.terraform_remote_state.base.outputs.allow_ssh_sg_id,
+    data.terraform_remote_state.base.outputs.allow_web_sg_id,
+    data.terraform_remote_state.base.outputs.allow_outbound_sg_id,
   ]
   user_data = data.template_file.user_data.rendered
 
@@ -59,13 +59,9 @@ resource "aws_instance" "my_nextcloud_instance" {
   }
 }
 
-data "aws_route53_zone" "my_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
-  name    = "nextcloud.aws.buetow.org" # Replace with your desired subdomain or leave empty for root
+  name    = "nextcloud-ec2.aws.buetow.org" # Replace with your desired subdomain or leave empty for root
   type    = "A"
   ttl     = "300"
   records = [aws_instance.my_nextcloud_instance.public_ip]
diff --git a/org-buetow-nextcloud/remotestate.tf b/org-buetow-nextcloud/remotestate.tf
index 523dca5..db9b321 100644
--- a/org-buetow-nextcloud/remotestate.tf
+++ b/org-buetow-nextcloud/remotestate.tf
@@ -1,4 +1,4 @@
-data "terraform_remote_state" "base_remote_state" {
+data "terraform_remote_state" "base" {
   backend = "s3"
   config = {
     bucket = "org-buetow-tfstate"
@@ -6,3 +6,12 @@ data "terraform_remote_state" "base_remote_state" {
     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