From 594190ae05b6500f4f76201409748f4e455880c7 Mon Sep 17 00:00:00 2001
From: Paul Buetow <paul@buetow.org>
Date: Wed, 20 Dec 2023 11:14:23 +0200
Subject: refactor

---
 org-buetow-nextcloud/data.tf      |  2 +-
 org-buetow-nextcloud/lb.tf        |  6 +++---
 org-buetow-nextcloud/main.tf      | 18 +++++++-----------
 org-buetow-nextcloud/variables.tf |  5 -----
 4 files changed, 11 insertions(+), 20 deletions(-)
 delete mode 100644 org-buetow-nextcloud/variables.tf

(limited to 'org-buetow-nextcloud')

diff --git a/org-buetow-nextcloud/data.tf b/org-buetow-nextcloud/data.tf
index 3a8f86c..17fb246 100644
--- a/org-buetow-nextcloud/data.tf
+++ b/org-buetow-nextcloud/data.tf
@@ -1,3 +1,3 @@
-data "aws_route53_zone" "my_zone" {
+data "aws_route53_zone" "zone" {
   name = "aws.buetow.org." # Replace with your domain name
 }
diff --git a/org-buetow-nextcloud/lb.tf b/org-buetow-nextcloud/lb.tf
index 49ba6dd..73e0d8a 100644
--- a/org-buetow-nextcloud/lb.tf
+++ b/org-buetow-nextcloud/lb.tf
@@ -1,5 +1,5 @@
-resource "aws_route53_record" "my_a_record" {
-  zone_id = data.aws_route53_zone.my_zone.zone_id
+resource "aws_route53_record" "a_record" {
+  zone_id = data.aws_route53_zone.zone.zone_id
   name    = "nextcloud.aws.buetow.org."
   type    = "A"
 
@@ -14,7 +14,7 @@ resource "aws_lb_target_group" "nextcloud_tg" {
   name        = "nextcloud-tg"
   port        = 80
   protocol    = "HTTP"
-  vpc_id      = data.terraform_remote_state.base.outputs.my_vpc_id
+  vpc_id      = data.terraform_remote_state.base.outputs.vpc_id
   target_type = "ip"
 
   health_check {
diff --git a/org-buetow-nextcloud/main.tf b/org-buetow-nextcloud/main.tf
index f07ae15..7fff623 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.outputs.my_self_hosted_services_efs_id
+    efs_id = data.terraform_remote_state.base.outputs.self_hosted_services_efs_id
   }
 }
 
@@ -37,15 +37,15 @@ data "aws_ami" "amazon_linux" {
 }
 
 resource "aws_key_pair" "id_rsa_pub" {
-  key_name   = "${var.environment}-id-rsa-pub"
+  key_name   = "nextcloud-id-rsa-pub"
   public_key = file("${path.module}/id_rsa.pub")
 }
 
-resource "aws_instance" "my_nextcloud_instance" {
+resource "aws_instance" "nextcloud" {
   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.outputs.my_public_subnet_a_id
+  subnet_id     = data.terraform_remote_state.base.outputs.public_subnet_a_id
 
   vpc_security_group_ids = [
     data.terraform_remote_state.base.outputs.allow_ssh_sg_id,
@@ -53,16 +53,12 @@ resource "aws_instance" "my_nextcloud_instance" {
     data.terraform_remote_state.base.outputs.allow_outbound_sg_id,
   ]
   user_data = data.template_file.user_data.rendered
-
-  tags = {
-    Name = "${var.environment}-my-nextcloud-instance"
-  }
 }
 
-resource "aws_route53_record" "my_record" {
-  zone_id = data.aws_route53_zone.my_zone.zone_id
+resource "aws_route53_record" "nextcloud_ec2_aws_buetow_org" {
+  zone_id = data.aws_route53_zone.zone.zone_id
   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]
+  records = [aws_instance.nextcloud.public_ip]
 }
diff --git a/org-buetow-nextcloud/variables.tf b/org-buetow-nextcloud/variables.tf
deleted file mode 100644
index e46675c..0000000
--- a/org-buetow-nextcloud/variables.tf
+++ /dev/null
@@ -1,5 +0,0 @@
-variable "environment" {
-  description = "The production nextcloud environment"
-  type        = string
-  default     = "production"
-}
-- 
cgit v1.2.3