asea config file tweaks (#1014)

Brian969 · web-flow · commit 77e7908f8467 · 2022-07-14T19:44:33.000-04:00
- Fix SCP spelling error
- revert rsyslog to IMDSv1 as boot script has v1 dependencies
diff --git a/reference-artifacts/SAMPLE_CONFIGS/config.example-oldIP.json b/reference-artifacts/SAMPLE_CONFIGS/config.example-oldIP.json
@@ -1278,7 +1278,7 @@
           "ssm-image-id": "/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2",
           "rsyslog-instance-type": "t3.large",
           "rsyslog-instance-role": "${ACCELERATOR_PREFIX_ND}-Rsyslog-Role",
-          "rsyslog-enforce-imdsv2": true,
+          "rsyslog-enforce-imdsv2": false,
           "rsyslog-root-volume-size": 100,
           "rsyslog-max-instance-age": 7
         }
diff --git a/reference-artifacts/SAMPLE_CONFIGS/config.example.json b/reference-artifacts/SAMPLE_CONFIGS/config.example.json
@@ -1275,7 +1275,7 @@
           "ssm-image-id": "/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2",
           "rsyslog-instance-type": "t3.large",
           "rsyslog-instance-role": "${ACCELERATOR_PREFIX_ND}-Rsyslog-Role",
-          "rsyslog-enforce-imdsv2": true,
+          "rsyslog-enforce-imdsv2": false,
           "rsyslog-root-volume-size": 100,
           "rsyslog-max-instance-age": 7
         }
diff --git a/reference-artifacts/SAMPLE_CONFIGS/config.lite-CTNFW-example.json b/reference-artifacts/SAMPLE_CONFIGS/config.lite-CTNFW-example.json
@@ -1248,7 +1248,7 @@
           "ssm-image-id": "/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2",
           "rsyslog-instance-type": "t3.large",
           "rsyslog-instance-role": "${ACCELERATOR_PREFIX_ND}-Rsyslog-Role",
-          "rsyslog-enforce-imdsv2": true,
+          "rsyslog-enforce-imdsv2": false,
           "rsyslog-root-volume-size": 100,
           "rsyslog-max-instance-age": 7
         }
diff --git a/reference-artifacts/SAMPLE_CONFIGS/config.lite-GWLB-example.json b/reference-artifacts/SAMPLE_CONFIGS/config.lite-GWLB-example.json
@@ -1236,7 +1236,7 @@
           "ssm-image-id": "/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2",
           "rsyslog-instance-type": "t3.large",
           "rsyslog-instance-role": "${ACCELERATOR_PREFIX_ND}-Rsyslog-Role",
-          "rsyslog-enforce-imdsv2": true,
+          "rsyslog-enforce-imdsv2": false,
           "rsyslog-root-volume-size": 100,
           "rsyslog-max-instance-age": 7
         }
diff --git a/reference-artifacts/SAMPLE_CONFIGS/config.lite-NFW-example.json b/reference-artifacts/SAMPLE_CONFIGS/config.lite-NFW-example.json
@@ -1231,7 +1231,7 @@
           "ssm-image-id": "/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2",
           "rsyslog-instance-type": "t3.large",
           "rsyslog-instance-role": "${ACCELERATOR_PREFIX_ND}-Rsyslog-Role",
-          "rsyslog-enforce-imdsv2": true,
+          "rsyslog-enforce-imdsv2": false,
           "rsyslog-root-volume-size": 100,
           "rsyslog-max-instance-age": 7
         }
diff --git a/reference-artifacts/SAMPLE_CONFIGS/config.lite-VPN-example-oldIP.json b/reference-artifacts/SAMPLE_CONFIGS/config.lite-VPN-example-oldIP.json
@@ -1228,7 +1228,7 @@
           "ssm-image-id": "/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2",
           "rsyslog-instance-type": "t3.large",
           "rsyslog-instance-role": "${ACCELERATOR_PREFIX_ND}-Rsyslog-Role",
-          "rsyslog-enforce-imdsv2": true,
+          "rsyslog-enforce-imdsv2": false,
           "rsyslog-root-volume-size": 100,
           "rsyslog-max-instance-age": 7
         }
diff --git a/reference-artifacts/SAMPLE_CONFIGS/config.lite-VPN-example.json b/reference-artifacts/SAMPLE_CONFIGS/config.lite-VPN-example.json
@@ -1225,7 +1225,7 @@
           "ssm-image-id": "/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2",
           "rsyslog-instance-type": "t3.large",
           "rsyslog-instance-role": "${ACCELERATOR_PREFIX_ND}-Rsyslog-Role",
-          "rsyslog-enforce-imdsv2": true,
+          "rsyslog-enforce-imdsv2": false,
           "rsyslog-root-volume-size": 100,
           "rsyslog-max-instance-age": 7
         }
diff --git a/reference-artifacts/SAMPLE_CONFIGS/config.multi-region-example.json b/reference-artifacts/SAMPLE_CONFIGS/config.multi-region-example.json
@@ -1499,7 +1499,7 @@
           "ssm-image-id": "/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2",
           "rsyslog-instance-type": "t3.large",
           "rsyslog-instance-role": "${ACCELERATOR_PREFIX_ND}-Rsyslog-Role",
-          "rsyslog-enforce-imdsv2": true,
+          "rsyslog-enforce-imdsv2": false,
           "rsyslog-root-volume-size": 100,
           "rsyslog-max-instance-age": 7
         }
diff --git a/reference-artifacts/SCPs/ASEA-Guardrails-Sensitive.json b/reference-artifacts/SCPs/ASEA-Guardrails-Sensitive.json
@@ -265,7 +265,7 @@
         "s3:ListMultiR*",
         "s3:PutMultiR*",
         "sns:Publish",
-        "tagging:GetResources"
+        "tag:GetResources"
       ],
       "Resource": "*",
       "Condition": {

Original file line number	Diff line number	Diff line change
`@@ -1278,7 +1278,7 @@`
`1278`	`1278`	`"ssm-image-id": "/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2",`
`1279`	`1279`	`"rsyslog-instance-type": "t3.large",`
`1280`	`1280`	`"rsyslog-instance-role": "${ACCELERATOR_PREFIX_ND}-Rsyslog-Role",`
`1281`		`- "rsyslog-enforce-imdsv2": true,`
	`1281`	`+ "rsyslog-enforce-imdsv2": false,`
`1282`	`1282`	`"rsyslog-root-volume-size": 100,`
`1283`	`1283`	`"rsyslog-max-instance-age": 7`
`1284`	`1284`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1275,7 +1275,7 @@`
`1275`	`1275`	`"ssm-image-id": "/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2",`
`1276`	`1276`	`"rsyslog-instance-type": "t3.large",`
`1277`	`1277`	`"rsyslog-instance-role": "${ACCELERATOR_PREFIX_ND}-Rsyslog-Role",`
`1278`		`- "rsyslog-enforce-imdsv2": true,`
	`1278`	`+ "rsyslog-enforce-imdsv2": false,`
`1279`	`1279`	`"rsyslog-root-volume-size": 100,`
`1280`	`1280`	`"rsyslog-max-instance-age": 7`
`1281`	`1281`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1248,7 +1248,7 @@`
`1248`	`1248`	`"ssm-image-id": "/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2",`
`1249`	`1249`	`"rsyslog-instance-type": "t3.large",`
`1250`	`1250`	`"rsyslog-instance-role": "${ACCELERATOR_PREFIX_ND}-Rsyslog-Role",`
`1251`		`- "rsyslog-enforce-imdsv2": true,`
	`1251`	`+ "rsyslog-enforce-imdsv2": false,`
`1252`	`1252`	`"rsyslog-root-volume-size": 100,`
`1253`	`1253`	`"rsyslog-max-instance-age": 7`
`1254`	`1254`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1236,7 +1236,7 @@`
`1236`	`1236`	`"ssm-image-id": "/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2",`
`1237`	`1237`	`"rsyslog-instance-type": "t3.large",`
`1238`	`1238`	`"rsyslog-instance-role": "${ACCELERATOR_PREFIX_ND}-Rsyslog-Role",`
`1239`		`- "rsyslog-enforce-imdsv2": true,`
	`1239`	`+ "rsyslog-enforce-imdsv2": false,`
`1240`	`1240`	`"rsyslog-root-volume-size": 100,`
`1241`	`1241`	`"rsyslog-max-instance-age": 7`
`1242`	`1242`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1231,7 +1231,7 @@`
`1231`	`1231`	`"ssm-image-id": "/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2",`
`1232`	`1232`	`"rsyslog-instance-type": "t3.large",`
`1233`	`1233`	`"rsyslog-instance-role": "${ACCELERATOR_PREFIX_ND}-Rsyslog-Role",`
`1234`		`- "rsyslog-enforce-imdsv2": true,`
	`1234`	`+ "rsyslog-enforce-imdsv2": false,`
`1235`	`1235`	`"rsyslog-root-volume-size": 100,`
`1236`	`1236`	`"rsyslog-max-instance-age": 7`
`1237`	`1237`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1228,7 +1228,7 @@`
`1228`	`1228`	`"ssm-image-id": "/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2",`
`1229`	`1229`	`"rsyslog-instance-type": "t3.large",`
`1230`	`1230`	`"rsyslog-instance-role": "${ACCELERATOR_PREFIX_ND}-Rsyslog-Role",`
`1231`		`- "rsyslog-enforce-imdsv2": true,`
	`1231`	`+ "rsyslog-enforce-imdsv2": false,`
`1232`	`1232`	`"rsyslog-root-volume-size": 100,`
`1233`	`1233`	`"rsyslog-max-instance-age": 7`
`1234`	`1234`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1225,7 +1225,7 @@`
`1225`	`1225`	`"ssm-image-id": "/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2",`
`1226`	`1226`	`"rsyslog-instance-type": "t3.large",`
`1227`	`1227`	`"rsyslog-instance-role": "${ACCELERATOR_PREFIX_ND}-Rsyslog-Role",`
`1228`		`- "rsyslog-enforce-imdsv2": true,`
	`1228`	`+ "rsyslog-enforce-imdsv2": false,`
`1229`	`1229`	`"rsyslog-root-volume-size": 100,`
`1230`	`1230`	`"rsyslog-max-instance-age": 7`
`1231`	`1231`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1499,7 +1499,7 @@`
`1499`	`1499`	`"ssm-image-id": "/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2",`
`1500`	`1500`	`"rsyslog-instance-type": "t3.large",`
`1501`	`1501`	`"rsyslog-instance-role": "${ACCELERATOR_PREFIX_ND}-Rsyslog-Role",`
`1502`		`- "rsyslog-enforce-imdsv2": true,`
	`1502`	`+ "rsyslog-enforce-imdsv2": false,`
`1503`	`1503`	`"rsyslog-root-volume-size": 100,`
`1504`	`1504`	`"rsyslog-max-instance-age": 7`
`1505`	`1505`	`}`