summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.md2
-rw-r--r--org-buetow-ecs/audiobookshelfservice.tf6
-rw-r--r--org-buetow-ecs/nginxservice.tf6
-rw-r--r--org-buetow-ecs/vaultwardenservice.tf6
-rw-r--r--org-buetow-ecs/wallabagservice.tf7
5 files changed, 13 insertions, 14 deletions
diff --git a/README.md b/README.md
index 26f4eea..41a96c7 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
* Nextcloud and Bastion: Auto re-create in different AZ on failure.
* Backup EFS, don't let `terraform destroy` erease all my data!
* Input variables, for configuring different service hosts.
-* Maybe register `buetow.cloud` domain (or keep using `aws.buetow.org`)
+* Maybe register `buetow.rocks` domain (or keep using `aws.buetow.org`)
## Create base environment
diff --git a/org-buetow-ecs/audiobookshelfservice.tf b/org-buetow-ecs/audiobookshelfservice.tf
index ca11ca6..24ec968 100644
--- a/org-buetow-ecs/audiobookshelfservice.tf
+++ b/org-buetow-ecs/audiobookshelfservice.tf
@@ -10,7 +10,7 @@ resource "aws_route53_record" "a_record_audiobookshelf" {
}
}
-resource "aws_ecs_task_definition" "audiobookshelf_task" {
+resource "aws_ecs_task_definition" "audiobookshelf" {
family = "audiobookshelf"
network_mode = "awsvpc"
requires_compatibilities = ["FARGATE"]
@@ -90,10 +90,10 @@ resource "aws_ecs_task_definition" "audiobookshelf_task" {
}])
}
-resource "aws_ecs_service" "audiobookshelf_service" {
+resource "aws_ecs_service" "audiobookshelf" {
name = "audiobookshelf"
cluster = aws_ecs_cluster.ecs_cluster.id
- task_definition = aws_ecs_task_definition.audiobookshelf_task.arn
+ task_definition = aws_ecs_task_definition.audiobookshelf.arn
launch_type = "FARGATE"
desired_count = 1
diff --git a/org-buetow-ecs/nginxservice.tf b/org-buetow-ecs/nginxservice.tf
index 3508d7c..bae4ae4 100644
--- a/org-buetow-ecs/nginxservice.tf
+++ b/org-buetow-ecs/nginxservice.tf
@@ -10,7 +10,7 @@ resource "aws_route53_record" "a_record" {
}
}
-resource "aws_ecs_task_definition" "nginx_task" {
+resource "aws_ecs_task_definition" "nginx" {
family = "nginx"
network_mode = "awsvpc"
requires_compatibilities = ["FARGATE"]
@@ -36,10 +36,10 @@ resource "aws_ecs_task_definition" "nginx_task" {
}])
}
-resource "aws_ecs_service" "nginx_service" {
+resource "aws_ecs_service" "nginx" {
name = "nginx"
cluster = aws_ecs_cluster.ecs_cluster.id
- task_definition = aws_ecs_task_definition.nginx_task.arn
+ task_definition = aws_ecs_task_definition.nginx.arn
launch_type = "FARGATE"
desired_count = 10
diff --git a/org-buetow-ecs/vaultwardenservice.tf b/org-buetow-ecs/vaultwardenservice.tf
index 10f4f6e..4eff90b 100644
--- a/org-buetow-ecs/vaultwardenservice.tf
+++ b/org-buetow-ecs/vaultwardenservice.tf
@@ -10,7 +10,7 @@ resource "aws_route53_record" "a_record_vaultwarden" {
}
}
-resource "aws_ecs_task_definition" "vaultwarden_task" {
+resource "aws_ecs_task_definition" "vaultwarden" {
family = "vaultwarden"
network_mode = "awsvpc"
requires_compatibilities = ["FARGATE"]
@@ -51,10 +51,10 @@ resource "aws_ecs_task_definition" "vaultwarden_task" {
}])
}
-resource "aws_ecs_service" "vaultwarden_service" {
+resource "aws_ecs_service" "vaultwarden" {
name = "vaultwarden"
cluster = aws_ecs_cluster.ecs_cluster.id
- task_definition = aws_ecs_task_definition.vaultwarden_task.arn
+ task_definition = aws_ecs_task_definition.vaultwarden.arn
launch_type = "FARGATE"
desired_count = 0
diff --git a/org-buetow-ecs/wallabagservice.tf b/org-buetow-ecs/wallabagservice.tf
index ee273af..939352c 100644
--- a/org-buetow-ecs/wallabagservice.tf
+++ b/org-buetow-ecs/wallabagservice.tf
@@ -10,14 +10,13 @@ resource "aws_route53_record" "a_record_wallabag" {
}
}
-resource "aws_ecs_task_definition" "wallabag_task" {
+resource "aws_ecs_task_definition" "wallabag" {
family = "wallabag"
network_mode = "awsvpc"
requires_compatibilities = ["FARGATE"]
cpu = "256"
memory = "512"
execution_role_arn = aws_iam_role.ecs_execution_role.arn
- #task_role_arn = aws_iam_role.ecs_task_execution_role.arn
volume {
name = "wallabag-db-efs-volume"
@@ -73,10 +72,10 @@ resource "aws_ecs_task_definition" "wallabag_task" {
}])
}
-resource "aws_ecs_service" "wallabag_service" {
+resource "aws_ecs_service" "wallabag" {
name = "wallabag"
cluster = aws_ecs_cluster.ecs_cluster.id
- task_definition = aws_ecs_task_definition.wallabag_task.arn
+ task_definition = aws_ecs_task_definition.wallabag.arn
launch_type = "FARGATE"
desired_count = 0