initial nlb

7 files changed, 38 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index 04cbd9d..30feaf3 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ apply:
 	cd org-buetow-base && terraform apply -auto-approve
 	cd org-buetow-bastion && terraform apply -auto-approve
 	cd org-buetow-elb && terraform apply -auto-approve
-	#cd org-buetow-ecs && terraform apply -auto-approve
+	cd org-buetow-ecs && terraform apply -auto-approve
 	#cd org-buetow-nextcloud && terraform apply -auto-approve
 destroy:
 	cd org-buetow-nextcloud && terraform destroy -auto-approve
diff --git a/org-buetow-bastion/main.tf b/org-buetow-bastion/main.tf
index 3e17d14..f2bd9ae 100644
--- a/org-buetow-bastion/main.tf
+++ b/org-buetow-bastion/main.tf
@@ -18,8 +18,8 @@ resource "aws_key_pair" "id_rsa_pub" {
 
 resource "aws_instance" "bastion" {
   #ami                = "ami-024f768332f080c5e" # Amazon Linux 2023
-  #ami                = "ami-0965c162c412da7ca" # Fedora Cloud ase 37.1.7
-  ami = "ami-0c5e86158864d14dd" # RHEL-9.3.0 arm
+  ami = "ami-0d0b8f748d0b16f5e" # Amazon Linux 2023 ARM
+  # ami = "ami-0c5e86158864d14dd" # RHEL-9.3.0 arm
   #instance_type      = "t2.micro"
   instance_type      = "t4g.nano" # ARM
   key_name           = aws_key_pair.id_rsa_pub.key_name
diff --git a/org-buetow-ecs/nginxservice.tf b/org-buetow-ecs/nginxservice.tf
index cbc5b1e..c092163 100644
--- a/org-buetow-ecs/nginxservice.tf
+++ b/org-buetow-ecs/nginxservice.tf
@@ -53,7 +53,7 @@ resource "aws_ecs_service" "nginx" {
   cluster         = aws_ecs_cluster.ecs_cluster.id
   task_definition = aws_ecs_task_definition.nginx.arn
   launch_type     = "FARGATE"
-  desired_count   = 3
+  desired_count   = 1
 
   load_balancer {
     target_group_arn = aws_lb_target_group.nginx_tg.arn
diff --git a/org-buetow-elb/nlb.tf b/org-buetow-elb/nlb.tf
new file mode 100644
index 0000000..07889ec
--- /dev/null
+++ b/org-buetow-elb/nlb.tf
@@ -0,0 +1,11 @@
+resource "aws_lb" "nlb" {
+  name               = "nlb"
+  internal           = false
+  load_balancer_type = "network"
+  ip_address_type    = "dualstack"
+  subnets = [
+    data.terraform_remote_state.base.outputs.public_subnet_a_id,
+    data.terraform_remote_state.base.outputs.public_subnet_b_id,
+    data.terraform_remote_state.base.outputs.public_subnet_c_id,
+  ]
+}
diff --git a/org-buetow-elb/outputs.tf b/org-buetow-elb/outputs.tf
index a96409c..5d9269d 100644
--- a/org-buetow-elb/outputs.tf
+++ b/org-buetow-elb/outputs.tf
@@ -9,3 +9,15 @@ output "alb_zone_id" {
 output "alb_https_listener_arn" {
   value = aws_lb_listener.https_listener.arn
 }
+
+output "nlb_arn" {
+  value = aws_lb.nlb.arn
+}
+
+output "nlb_dns_name" {
+  value = aws_lb.nlb.dns_name
+}
+
+output "nlb_zone_id" {
+  value = aws_lb.nlb.zone_id
+}
diff --git a/org-buetow-nextcloud/main.tf b/org-buetow-nextcloud/main.tf
index bbb66d1..ed604ea 100644
--- a/org-buetow-nextcloud/main.tf
+++ b/org-buetow-nextcloud/main.tf
@@ -35,10 +35,18 @@ resource "aws_instance" "nextcloud" {
   }
 }
 
-resource "aws_route53_record" "nextcloud_ec2_buetow_cloud" {
+resource "aws_route53_record" "nextcloud_a_record" {
   zone_id = data.terraform_remote_state.base.outputs.buetow_cloud_zone_id
-  name    = "nextcloud-ec2.buetow.cloud"
+  name    = "nextcloud.buetow.cloud"
   type    = "A"
   ttl     = "300"
   records = [aws_instance.nextcloud.public_ip]
 }
+
+resource "aws_route53_record" "nextcloud_aaaa_record" {
+  zone_id = data.terraform_remote_state.base.outputs.buetow_cloud_zone_id
+  name    = "nextcloud.buetow.cloud"
+  type    = "AAAA"
+  ttl     = "300"
+  records = aws_instance.nextcloud.ipv6_addresses
+}
diff --git a/org-buetow-nextcloud/user_data.tpl b/org-buetow-nextcloud/user_data.tpl
index 3041342..fb902e9 100644
--- a/org-buetow-nextcloud/user_data.tpl
+++ b/org-buetow-nextcloud/user_data.tpl
@@ -10,7 +10,7 @@ sudo usermod -a -G docker ec2-user
 # EFS
 yum install -y amazon-efs-utils
 mkdir /mnt/efs
-echo '${efs_id}.efs.${region}.amazonaws.com:/ /mnt/efs nfs4 defaults,vers=4.1 0 0' >> /etc/fstab
+echo '${efs_id}.efs.${region}.amazonaws.com:/ec2/nextcloud /mnt/efs nfs4 defaults,vers=4.1 0 0' >> /etc/fstab
 while ! mountpoint /mnt/efs; do
     echo 'Retrying to mount file systems after 10s...'
     mount -a