Merge main --> prod (#3580)

* Bug: "Test Site" Banner on Production Error Pages (#3573)

* Add error handlers for other standard error pages

* Add error handlers for other standard error pages

* Reset file upload timeout to 30s. Oops.

* back to 8 (#3579)

---------

Co-authored-by: James Person <[email protected]>

backend/manifests/vars/vars-production.yml

@@ -1,7 +1,7 @@
-app_name: gsa-fac
-mem_amount: 4G
-cf_env_name: PRODUCTION
-env_name: prod
-service_name: production
-endpoint: app.fac.gov
-instances: 2
+app_name: gsa-fac
+mem_amount: 4G
+cf_env_name: PRODUCTION
+env_name: prod
+service_name: production
+endpoint: app.fac.gov
+instances: 2

terraform/production/production.tf

@@ -1,30 +1,30 @@
-module "production" {
-  source                = "../shared/modules/env"
-  cf_space_name         = "production"
-  new_relic_license_key = var.new_relic_license_key
-  pgrst_jwt_secret      = var.pgrst_jwt_secret
-  clamav_instances      = 1
-  clamav_fs_instances   = 1
-  database_plan         = "xlarge-gp-psql-redundant"
-  postgrest_instances   = 4
-  json_params = jsonencode(
-    {
-      "storage" : 50,
-    }
-  )
-}
-
-# Note: The very first time we run apply in production, this will fail because
-# the app it refers to, gsa-fac, doesn't exist yet; gsa-fac is deployed outside
-# of Terraform. To address this, we should manage deployment of gsa-fac in
-# Terraform.
-module "domain" {
-  source = "github.com/18f/terraform-cloudgov//domain?ref=v0.7.0"
-
-  cf_org_name    = "gsa-tts-oros-fac"
-  cf_space_name  = "production"
-  app_name_or_id = "gsa-fac"
-  cdn_plan_name  = "domain"
-  domain_name    = "fac.gov"
-  host_name      = "app"
-}
+module "production" {
+  source                = "../shared/modules/env"
+  cf_space_name         = "production"
+  new_relic_license_key = var.new_relic_license_key
+  pgrst_jwt_secret      = var.pgrst_jwt_secret
+  clamav_instances      = 1
+  clamav_fs_instances   = 1
+  database_plan         = "xlarge-gp-psql-redundant"
+  postgrest_instances   = 4
+  json_params = jsonencode(
+    {
+      "storage" : 50,
+    }
+  )
+}
+
+# Note: The very first time we run apply in production, this will fail because
+# the app it refers to, gsa-fac, doesn't exist yet; gsa-fac is deployed outside
+# of Terraform. To address this, we should manage deployment of gsa-fac in
+# Terraform.
+module "domain" {
+  source = "github.com/18f/terraform-cloudgov//domain?ref=v0.7.0"
+
+  cf_org_name    = "gsa-tts-oros-fac"
+  cf_space_name  = "production"
+  app_name_or_id = "gsa-fac"
+  cdn_plan_name  = "domain"
+  domain_name    = "fac.gov"
+  host_name      = "app"
+}