revert back the discourse rds apply immediately to false and update t…

…he rds moderator cert
mozilla-it · Jan 19, 2024 · 5b61ee3 · 5b61ee3
1 parent b96218d
commit 5b61ee3
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/terraform/applications/discourse/variables.tf b/terraform/applications/discourse/variables.tf
@@ -25,7 +25,7 @@ locals {
  redis_num_nodes = 1
  redis_version = "5.0.6"
  ca_cert_identifier = "rds-ca-rsa4096-g1"
- apply_immediately = true
+ apply_immediately = false
 
 
  }
@@ -42,7 +42,7 @@ locals {
  redis_num_nodes = 1
  redis_version = "5.0.6"
  ca_cert_identifier = "rds-ca-rsa4096-g1"
- apply_immediately = true
+ apply_immediately = false
  }
  }
 

diff --git a/terraform/applications/moderator/mysql.tf b/terraform/applications/moderator/mysql.tf
@@ -39,4 +39,5 @@ resource "aws_db_instance" "moderator" {
  db_subnet_group_name = aws_db_subnet_group.moderator-db.id
  vpc_security_group_ids = [aws_security_group.moderator-db.id]
  apply_immediately = true
+ ca_cert_identifier = var.ca_cert_identifier
 }
diff --git a/terraform/applications/moderator/variables.tf b/terraform/applications/moderator/variables.tf
@@ -29,7 +29,7 @@ variable "mysql_storage_max" {
 }
 
 variable "mysql_version" {
- default = "5.6"
+ default = "5.7.42"
  type = string
 }
 
@@ -52,3 +52,8 @@ variable "region" {
  default = "us-west-2"
  type = string
 }
+
+variable "ca_cert_identifier" {
+ default = "rds-ca-rsa4096-g1"
+ description = "Allows you to modify the underlying RDS certificate"
+}
diff --git a/terraform/applications/moderator/variables.tfvars b/terraform/applications/moderator/variables.tfvars
@@ -4,7 +4,7 @@ moderator_mozilla = "moderator.allizom.org"
 mysql_instance = "db.t3.micro"
 mysql_storage_allocated = 5
 mysql_storage_max = 20
-mysql_version = "5.7"
+mysql_version = "5.7.42"
 project = "moderator"
 project_desc = "moderator.allizom.org"
 project_email = "it-sre@mozilla.com"