Merge branch 'main' of github.com:ooni/devops

* 'main' of github.com:ooni/devops: Rotate docker log files after 100MB (#108) Use same instance size on dev for ecs cluster
ooni · Oct 16, 2024 · 152034b · 152034b
2 parents 91b90a7 + 5ae6fc0
commit 152034b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/tf/environments/dev/main.tf b/tf/environments/dev/main.tf
@@ -314,9 +314,9 @@ module "ooniapi_cluster" {
 
   asg_min     = 2
   asg_max     = 6
-  asg_desired = 3
+  asg_desired = 2
 
-  instance_type = "t3.micro"
+  instance_type = "t3a.medium"
 
   tags = merge(
     local.tags,
@@ -651,4 +651,4 @@ resource "aws_route53_record" "ooniapi_frontend_cert_validation" {
 resource "aws_acm_certificate_validation" "ooniapi_frontend" {
   certificate_arn         = aws_acm_certificate.ooniapi_frontend.arn
   validation_record_fqdns = [for record in aws_route53_record.ooniapi_frontend_cert_validation : record.fqdn]
-}
+}
diff --git a/tf/modules/ooni_th_droplet/templates/cloud-init-docker.yml b/tf/modules/ooni_th_droplet/templates/cloud-init-docker.yml
@@ -103,7 +103,9 @@ write_files:
     content: |
       {
         "ipv6": true,
-        "fixed-cidr-v6": "2001:db8:1::/64"
+        "fixed-cidr-v6": "2001:db8:1::/64",
+        "log-driver": "json-file",
+        "log-opts": {"max-size": "100m", "max-file": "3"}
       }
 
   - path: /etc/nginx/sites-available/default