refactor

2 files changed, 43 insertions, 45 deletions

diff --git a/org-buetow-ecs/wallabagservice.tf b/org-buetow-ecs/bagservice.tf
index d3e5e41..38de3ee 100644
--- a/org-buetow-ecs/wallabagservice.tf
+++ b/org-buetow-ecs/bagservice.tf
@@ -1,4 +1,4 @@
-resource "aws_route53_record" "a_record_wallabag" {
+resource "aws_route53_record" "a_record_bag" {
   zone_id = data.terraform_remote_state.base.outputs.buetow_cloud_zone_id
   name    = "bag.buetow.cloud."
   type    = "A"
@@ -10,7 +10,7 @@ resource "aws_route53_record" "a_record_wallabag" {
   }
 }
 
-resource "aws_route53_record" "aaaa_record_wallabag" {
+resource "aws_route53_record" "aaaa_record_bag" {
   zone_id = data.terraform_remote_state.base.outputs.buetow_cloud_zone_id
   name    = "bag.buetow.cloud."
   type    = "AAAA"
@@ -22,8 +22,8 @@ resource "aws_route53_record" "aaaa_record_wallabag" {
   }
 }
 
-resource "aws_ecs_task_definition" "wallabag" {
-  family                   = "wallabag"
+resource "aws_ecs_task_definition" "bag" {
+  family                   = "bag"
   network_mode             = "awsvpc"
   requires_compatibilities = ["FARGATE"]
   cpu                      = "256"
@@ -31,26 +31,24 @@ resource "aws_ecs_task_definition" "wallabag" {
   execution_role_arn       = aws_iam_role.ecs_execution_role.arn
 
   volume {
-    name = "wallabag-db-efs-volume"
+    name = "bag-db-efs-volume"
     efs_volume_configuration {
       file_system_id = data.terraform_remote_state.base.outputs.self_hosted_services_efs_id
-      root_directory = "/ecs/wallabag/data/db"
+      root_directory = "/ecs/bag/data/db"
     }
   }
 
   volume {
-    name = "wallabag-assets-efs-volume"
+    name = "bag-assets-efs-volume"
     efs_volume_configuration {
       file_system_id = data.terraform_remote_state.base.outputs.self_hosted_services_efs_id
-      root_directory = "/ecs/wallabag/data/assets"
+      root_directory = "/ecs/bag/data/assets"
     }
   }
 
   container_definitions = jsonencode([{
-    name  = "wallabag",
+    name  = "bag",
     image = "wallabag/wallabag",
-    #entryPoint = ["/bin/sh", "-c"],
-    #command    = ["ls", "-ld", "/var/www/wallabag/*"],
     portMappings = [{
       containerPort = 80,
       hostPort      = 80
@@ -63,13 +61,13 @@ resource "aws_ecs_task_definition" "wallabag" {
     ],
     mountPoints = [
       {
-        sourceVolume  = "wallabag-db-efs-volume"
-        containerPath = "/var/www/wallabag/data/db"
+        sourceVolume  = "bag-db-efs-volume"
+        containerPath = "/var/www/bag/data/db"
         readOnly      = false
       },
       {
-        sourceVolume  = "wallabag-assets-efs-volume"
-        containerPath = "/var/www/wallabag/data/assets"
+        sourceVolume  = "bag-assets-efs-volume"
+        containerPath = "/var/www/bag/data/assets"
         readOnly      = false
       }
     ],
@@ -78,23 +76,23 @@ resource "aws_ecs_task_definition" "wallabag" {
       "options" : {
         "awslogs-group" : "/ecs/containers",
         "awslogs-region" : "eu-central-1",
-        "awslogs-stream-prefix" : "wallabag"
+        "awslogs-stream-prefix" : "bag"
       }
     }
   }])
 }
 
-resource "aws_ecs_service" "wallabag" {
-  name            = "wallabag"
+resource "aws_ecs_service" "bag" {
+  name            = "bag"
   cluster         = aws_ecs_cluster.ecs_cluster.id
-  task_definition = aws_ecs_task_definition.wallabag.arn
+  task_definition = aws_ecs_task_definition.bag.arn
   launch_type     = "FARGATE"
   desired_count   = 1
 
   load_balancer {
-    target_group_arn = aws_lb_target_group.wallabag_tg.arn
-    container_name   = "wallabag" # Must match the name in your container definition
-    container_port   = 80         # The port your container is listening on
+    target_group_arn = aws_lb_target_group.bag_tg.arn
+    container_name   = "bag" # Must match the name in your container definition
+    container_port   = 80    # The port your container is listening on
   }
 
   network_configuration {
@@ -108,8 +106,8 @@ resource "aws_ecs_service" "wallabag" {
   }
 }
 
-resource "aws_lb_target_group" "wallabag_tg" {
-  name        = "wallabag-tg"
+resource "aws_lb_target_group" "bag_tg" {
+  name        = "bag-tg"
   port        = 80
   protocol    = "HTTP"
   vpc_id      = data.terraform_remote_state.base.outputs.vpc_id
@@ -127,13 +125,13 @@ resource "aws_lb_target_group" "wallabag_tg" {
   }
 }
 
-resource "aws_lb_listener_rule" "wallabag_https_listener_rule" {
+resource "aws_lb_listener_rule" "bag_https_listener_rule" {
   listener_arn = data.terraform_remote_state.elb.outputs.alb_https_listener_arn
   priority     = 101
 
   action {
     type             = "forward"
-    target_group_arn = aws_lb_target_group.wallabag_tg.arn
+    target_group_arn = aws_lb_target_group.bag_tg.arn
   }
 
   condition {
diff --git a/org-buetow-ecs/vaultwardenservice.tf b/org-buetow-ecs/vaultservice.tf
index 4807bbd..f566d94 100644
--- a/org-buetow-ecs/vaultwardenservice.tf
+++ b/org-buetow-ecs/vaultservice.tf
@@ -1,4 +1,4 @@
-resource "aws_route53_record" "a_record_vaultwarden" {
+resource "aws_route53_record" "a_record_vault" {
   zone_id = data.terraform_remote_state.base.outputs.buetow_cloud_zone_id
   name    = "vault.buetow.cloud."
   type    = "A"
@@ -10,7 +10,7 @@ resource "aws_route53_record" "a_record_vaultwarden" {
   }
 }
 
-resource "aws_route53_record" "aaaa_record_vaultwarden" {
+resource "aws_route53_record" "aaaa_record_vault" {
   zone_id = data.terraform_remote_state.base.outputs.buetow_cloud_zone_id
   name    = "vault.buetow.cloud."
   type    = "AAAA"
@@ -22,8 +22,8 @@ resource "aws_route53_record" "aaaa_record_vaultwarden" {
   }
 }
 
-resource "aws_ecs_task_definition" "vaultwarden" {
-  family                   = "vaultwarden"
+resource "aws_ecs_task_definition" "vault" {
+  family                   = "vault"
   network_mode             = "awsvpc"
   requires_compatibilities = ["FARGATE"]
   cpu                      = "256"
@@ -31,15 +31,15 @@ resource "aws_ecs_task_definition" "vaultwarden" {
   execution_role_arn       = aws_iam_role.ecs_execution_role.arn
 
   volume {
-    name = "vaultwarden-data-efs-volume"
+    name = "vault-data-efs-volume"
     efs_volume_configuration {
       file_system_id = data.terraform_remote_state.base.outputs.self_hosted_services_efs_id
-      root_directory = "/ecs/vaultwarden/data"
+      root_directory = "/ecs/vault/data"
     }
   }
 
   container_definitions = jsonencode([{
-    name  = "vaultwarden",
+    name  = "vault",
     image = "vaultwarden/server:latest",
     portMappings = [{
       containerPort = 80,
@@ -47,7 +47,7 @@ resource "aws_ecs_task_definition" "vaultwarden" {
     }],
     mountPoints = [
       {
-        sourceVolume  = "vaultwarden-data-efs-volume"
+        sourceVolume  = "vault-data-efs-volume"
         containerPath = "/data"
         readOnly      = false
       }
@@ -57,23 +57,23 @@ resource "aws_ecs_task_definition" "vaultwarden" {
       "options" : {
         "awslogs-group" : "/ecs/containers",
         "awslogs-region" : "eu-central-1",
-        "awslogs-stream-prefix" : "vaultwarden"
+        "awslogs-stream-prefix" : "vault"
       }
     }
   }])
 }
 
-resource "aws_ecs_service" "vaultwarden" {
-  name            = "vaultwarden"
+resource "aws_ecs_service" "vault" {
+  name            = "vault"
   cluster         = aws_ecs_cluster.ecs_cluster.id
-  task_definition = aws_ecs_task_definition.vaultwarden.arn
+  task_definition = aws_ecs_task_definition.vault.arn
   launch_type     = "FARGATE"
   desired_count   = 1
 
   load_balancer {
-    target_group_arn = aws_lb_target_group.vaultwarden_tg.arn
-    container_name   = "vaultwarden" # Must match the name in your container definition
-    container_port   = 80            # The port your container is listening on
+    target_group_arn = aws_lb_target_group.vault_tg.arn
+    container_name   = "vault" # Must match the name in your container definition
+    container_port   = 80      # The port your container is listening on
   }
 
   network_configuration {
@@ -87,8 +87,8 @@ resource "aws_ecs_service" "vaultwarden" {
   }
 }
 
-resource "aws_lb_target_group" "vaultwarden_tg" {
-  name        = "vaultwarden-tg"
+resource "aws_lb_target_group" "vault_tg" {
+  name        = "vault-tg"
   port        = 80
   protocol    = "HTTP"
   vpc_id      = data.terraform_remote_state.base.outputs.vpc_id
@@ -106,13 +106,13 @@ resource "aws_lb_target_group" "vaultwarden_tg" {
   }
 }
 
-resource "aws_lb_listener_rule" "vaultwarden_https_listener_rule" {
+resource "aws_lb_listener_rule" "vault_https_listener_rule" {
   listener_arn = data.terraform_remote_state.elb.outputs.alb_https_listener_arn
   priority     = 103
 
   action {
     type             = "forward"
-    target_group_arn = aws_lb_target_group.vaultwarden_tg.arn
+    target_group_arn = aws_lb_target_group.vault_tg.arn
   }
 
   condition {