Merge pull request #3351 from ministryofjustice/Patch_Schedule_2_130923

Patch_Schedule_2_130923
ministryofjustice · Sep 13, 2023 · 59652a2 · 59652a2
2 parents 78d2b65 + 885a292
commit 59652a2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/terraform/environments/ppud/application_variables.json b/terraform/environments/ppud/application_variables.json
@@ -6,7 +6,7 @@
       "WAM_ALB": "WAM-ALB-DEV",
       "patch_group": "dev_win_patch",
       "patch_maintenance_window_name": "dev_patch_maintenance_window",
-      "patch_maintenance_schedule_cron": "cron(0 18 ? * 2#3 *)",
+      "patch_maintenance_schedule_cron": "cron(0 18 ? * 3#3 *)",
       "patch_maintenance_window_duration": 3,
       "maintenance_window_target_name": "development_maintenance_window_target",
       "maintenance_window_target_description": "This is the dev patch maintenance window target",
@@ -27,7 +27,7 @@
       "PPUD_Target": "PPUD",
       "patch_group": "uat_win_patch",
       "patch_maintenance_window_name": "uat_patch_maintenance_window",
-      "patch_maintenance_schedule_cron": "cron(0 18 ? * 2#3 *)",
+      "patch_maintenance_schedule_cron": "cron(0 18 ? * 3#3 *)",
       "patch_maintenance_window_duration": 3,
       "maintenance_window_target_name": "uat_patch_maintenance_window_target",
       "maintenance_window_target_description": "This is the uat patch maintenance window target",
@@ -43,14 +43,14 @@
       "PPUD_Target": "PPUD",
       "patch_group": "prod_win_patch",
       "patch_maintenance_window_name": "prod_patch_maintenance_window",
-      "patch_maintenance_schedule_cron": "cron(0 20 ? * 2#4 *)",
+      "patch_maintenance_schedule_cron": "cron(0 20 ? * 3#4 *)",
       "patch_maintenance_window_duration": 4,
       "maintenance_window_target_name": "prod_patch_maintenance_window_target",
       "maintenance_window_target_description": "This is the production patch maintenance window target",
       "maintenance_window_task_name": "Prod-Instance-Patch",
       "lin_patch_group": "prod_lin_patch",
       "patch_lin_maintenance_window_name": "prod_lin_patch_maintenance_window",
-      "patch_lin_maintenance_schedule_cron": "cron(0 20 ? * 3#4 *)",
+      "patch_lin_maintenance_schedule_cron": "cron(0 20 ? * 4#4 *)",
       "patch_lin_maintenance_window_duration": 4,
       "maintenance_lin_window_target_name": "prod_lin_patch_maintenance_window_target",
       "maintenance_lin_window_target_description": "This is the production linux patch maintenance window target",

diff --git a/terraform/environments/ppud/lin_patchmgmt.tf b/terraform/environments/ppud/lin_patchmgmt.tf
@@ -20,7 +20,7 @@ resource "aws_ssm_patch_baseline" "linux_os_baseline" {
   operating_system = "AMAZON_LINUX_2"
 
   approval_rule {
-    approve_after_days  = 14
+    approve_after_days  = 6
     enable_non_security = false
 
     patch_filter {
@@ -43,7 +43,7 @@ resource "aws_ssm_patch_baseline" "linux_os_baseline" {
 
 # Create Maintenance Windows
 # Production Linux
-# second Monday of the month at 20:00
+# Fourth Wednesday of the month at 20:00
 
 resource "aws_ssm_maintenance_window" "prod_lin_patch_maintenance_window" {
   count             = local.is-production == true ? 1 : 0

diff --git a/terraform/environments/ppud/win_patchmgmt.tf b/terraform/environments/ppud/win_patchmgmt.tf
@@ -15,7 +15,7 @@ resource "aws_ssm_patch_baseline" "windows_os_apps_baseline" {
   operating_system = "WINDOWS"
 
   approval_rule {
-    approve_after_days = 14
+    approve_after_days = 6
 
     patch_filter {
       key    = "PRODUCT"
@@ -33,7 +33,7 @@ resource "aws_ssm_patch_baseline" "windows_os_apps_baseline" {
   }
 
   approval_rule {
-    approve_after_days = 14
+    approve_after_days = 6
 
     patch_filter {
       key    = "PATCH_SET"
@@ -51,9 +51,9 @@ resource "aws_ssm_patch_baseline" "windows_os_apps_baseline" {
 
 # Create Maintenance Windows
 
-# Development : First Monday of the month at 18:00
-# UAT: First Tuesday of the month at 18:00
-# Production: Second Tuesday of the month at 20:00
+# Development : Third Tuesday of the month at 18:00
+# UAT: Third Tuesday of the month at 18:00
+# Production: Fourth Tuesday of the month at 20:00
 
 resource "aws_ssm_maintenance_window" "patch_maintenance_window" {
   name              = local.application_data.accounts[local.environment].patch_maintenance_window_name