From 273956e6b596dcd44146a11741e77a097db67f85 Mon Sep 17 00:00:00 2001
From: Hope Aitchison <hope.aitchison@digital.justice.gov.uk>
Date: Wed, 18 Oct 2023 10:39:23 +0100
Subject: [PATCH 1/2] rebuilding r3 web server to subnet a and adding dns
 records to region 3

---
 .../locals_preproduction.tf                        | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/terraform/environments/corporate-staff-rostering/locals_preproduction.tf b/terraform/environments/corporate-staff-rostering/locals_preproduction.tf
index 61fe5094467..bfa58c1c0b1 100644
--- a/terraform/environments/corporate-staff-rostering/locals_preproduction.tf
+++ b/terraform/environments/corporate-staff-rostering/locals_preproduction.tf
@@ -111,6 +111,10 @@ locals {
           ami         = "pp-csr-a-17-a"
           component   = "app"
         }
+        route53_records = {
+          create_internal_record = true
+          create_external_record = true
+        }
       }
 
       pp-csr-w-7-b = {
@@ -199,11 +203,11 @@ locals {
         }
       }
 
-      pp-csr-w-5-b = {
+      pp-csr-w-5-a = {
         config = merge(module.baseline_presets.ec2_instance.config.default, {
           ami_name                      = "PPCWW00005"
           ami_owner                     = "self"
-          availability_zone             = "${local.region}b"
+          availability_zone             = "${local.region}a"
           ebs_volumes_copy_all_from_ami = false
         })
         instance = merge(module.baseline_presets.ec2_instance.instance.default, {
@@ -223,9 +227,13 @@ locals {
         tags = {
           description = "copy of PPCWW00005 for csr ${local.environment}"
           os-type     = "Windows"
-          ami         = "pp-csr-w-5-b"
+          ami         = "PPCWW00005"
           component   = "web"
         }
+        route53_records = {
+          create_internal_record = true
+          create_external_record = true
+        }
       }
 
     }

From 8d47fad38018852d084034b060f1f3d89958d92a Mon Sep 17 00:00:00 2001
From: Hope Aitchison <hope.aitchison@digital.justice.gov.uk>
Date: Wed, 18 Oct 2023 11:02:45 +0100
Subject: [PATCH 2/2] updating SGs for web server

---
 .../corporate-staff-rostering/locals_preproduction.tf           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/terraform/environments/corporate-staff-rostering/locals_preproduction.tf b/terraform/environments/corporate-staff-rostering/locals_preproduction.tf
index bfa58c1c0b1..3d642c51435 100644
--- a/terraform/environments/corporate-staff-rostering/locals_preproduction.tf
+++ b/terraform/environments/corporate-staff-rostering/locals_preproduction.tf
@@ -214,7 +214,7 @@ locals {
           instance_type           = "m5.2xlarge"
           disable_api_termination = true
           monitoring              = true
-          vpc_security_group_ids  = ["migration-web-sg", "domain-controller"]
+          vpc_security_group_ids  = ["domain", "web", "jumpserver"]
           tags = {
             backup-plan = "daily-and-weekly"
           }