summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Buetow <paul@buetow.org>2023-12-26 21:24:30 +0200
committerPaul Buetow <paul@buetow.org>2023-12-26 21:24:30 +0200
commit688925b3e6619ce89e026df69b622318c9569e36 (patch)
tree509e7d35b71ec998ee3d4b329fc10d3fd493f824
parent18bbfd726aa381ba77e294f657eaaa8b61f2079e (diff)
more on this
-rw-r--r--org-buetow-ecs/audiobookshelfservice.tf29
-rw-r--r--org-buetow-ecs/bagservice.tf20
-rw-r--r--org-buetow-ecs/nginxservice.tf2
3 files changed, 26 insertions, 25 deletions
diff --git a/org-buetow-ecs/audiobookshelfservice.tf b/org-buetow-ecs/audiobookshelfservice.tf
index 2e677f7..2e817fb 100644
--- a/org-buetow-ecs/audiobookshelfservice.tf
+++ b/org-buetow-ecs/audiobookshelfservice.tf
@@ -26,8 +26,8 @@ resource "aws_ecs_task_definition" "audiobookshelf" {
family = "audiobookshelf"
network_mode = "awsvpc"
requires_compatibilities = ["FARGATE"]
- cpu = "256"
- memory = "512"
+ cpu = "1024"
+ memory = "2048"
execution_role_arn = aws_iam_role.ecs_execution_role.arn
volume {
@@ -38,13 +38,14 @@ resource "aws_ecs_task_definition" "audiobookshelf" {
}
}
- volume {
- name = "audiobookshelf-metadata-efs-volume"
- efs_volume_configuration {
- file_system_id = data.terraform_remote_state.base.outputs.self_hosted_services_efs_id
- root_directory = "/ecs/audiobookshelf/metadata"
- }
- }
+ # Can't use Audiobookshelf's metadata on EFS (Mobile app won't stream, due to missing inode info???)
+ #volume {
+ # name = "audiobookshelf-metadata-efs-volume"
+ # efs_volume_configuration {
+ # file_system_id = data.terraform_remote_state.base.outputs.self_hosted_services_efs_id
+ # root_directory = "/ecs/audiobookshelf/metadata"
+ # }
+ #}
volume {
name = "audiobookshelf-audiobooks-efs-volume"
@@ -75,11 +76,11 @@ resource "aws_ecs_task_definition" "audiobookshelf" {
containerPath = "/config"
readOnly = false
},
- {
- sourceVolume = "audiobookshelf-metadata-efs-volume"
- containerPath = "/metadata"
- readOnly = false
- },
+ #{
+ # sourceVolume = "audiobookshelf-metadata-efs-volume"
+ # containerPath = "/metadata"
+ # readOnly = false
+ #},
{
sourceVolume = "audiobookshelf-audiobooks-efs-volume"
containerPath = "/audiobooks"
diff --git a/org-buetow-ecs/bagservice.tf b/org-buetow-ecs/bagservice.tf
index 38de3ee..d7a2dc9 100644
--- a/org-buetow-ecs/bagservice.tf
+++ b/org-buetow-ecs/bagservice.tf
@@ -26,23 +26,23 @@ resource "aws_ecs_task_definition" "bag" {
family = "bag"
network_mode = "awsvpc"
requires_compatibilities = ["FARGATE"]
- cpu = "256"
- memory = "512"
+ cpu = "1024"
+ memory = "2048"
execution_role_arn = aws_iam_role.ecs_execution_role.arn
volume {
- name = "bag-db-efs-volume"
+ name = "bag-data-efs-volume"
efs_volume_configuration {
file_system_id = data.terraform_remote_state.base.outputs.self_hosted_services_efs_id
- root_directory = "/ecs/bag/data/db"
+ root_directory = "/ecs/bag/data"
}
}
volume {
- name = "bag-assets-efs-volume"
+ name = "bag-images-efs-volume"
efs_volume_configuration {
file_system_id = data.terraform_remote_state.base.outputs.self_hosted_services_efs_id
- root_directory = "/ecs/bag/data/assets"
+ root_directory = "/ecs/bag/images"
}
}
@@ -61,13 +61,13 @@ resource "aws_ecs_task_definition" "bag" {
],
mountPoints = [
{
- sourceVolume = "bag-db-efs-volume"
- containerPath = "/var/www/bag/data/db"
+ sourceVolume = "bag-data-efs-volume"
+ containerPath = "/var/www/wallabag/data"
readOnly = false
},
{
- sourceVolume = "bag-assets-efs-volume"
- containerPath = "/var/www/bag/data/assets"
+ sourceVolume = "bag-images-efs-volume"
+ containerPath = "/var/www/wallabag/data/assets/images"
readOnly = false
}
],
diff --git a/org-buetow-ecs/nginxservice.tf b/org-buetow-ecs/nginxservice.tf
index c092163..453ecb2 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 = 1
+ desired_count = 0
load_balancer {
target_group_arn = aws_lb_target_group.nginx_tg.arn