diff --git a/terraform/applications/moderator/mysql.tf b/terraform/applications/moderator/mysql.tf index cd64881..c4c0efe 100644 --- a/terraform/applications/moderator/mysql.tf +++ b/terraform/applications/moderator/mysql.tf @@ -33,10 +33,10 @@ resource "aws_db_instance" "moderator" { max_allocated_storage = var.mysql_storage_max multi_az = var.environment == "prod" ? true : false allow_major_version_upgrade = true - name = var.project username = var.project backup_retention_period = 30 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/state.tf b/terraform/applications/moderator/state.tf index e1bea44..c88c219 100644 --- a/terraform/applications/moderator/state.tf +++ b/terraform/applications/moderator/state.tf @@ -8,7 +8,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws", - version = "~> 3.27" + version = "> 3.27" } } diff --git a/terraform/applications/moderator/variables.tf b/terraform/applications/moderator/variables.tf index 3d30948..d37c52f 100644 --- 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,9 @@ 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 index 945a06d..a3b3926 100644 --- a/terraform/applications/moderator/variables.tfvars +++ b/terraform/applications/moderator/variables.tfvars @@ -4,7 +4,7 @@ moderator_mozilla = "moderator.mozilla.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.mozilla.org" project_email = "it-sre@mozilla.com"