diff --git a/DeepSecurity/Common/DB/DSDBAbstract.template b/DeepSecurity/Common/DB/DSDBAbstract.template
index 51d1a2e..7ec8239 100644
--- a/DeepSecurity/Common/DB/DSDBAbstract.template
+++ b/DeepSecurity/Common/DB/DSDBAbstract.template
@@ -122,7 +122,7 @@
"Type" : "AWS::CloudFormation::Stack",
"Condition" : "DBTypeIsOracle",
"Properties" : {
- "TemplateURL" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.2/Common/DB/DSDBOracleRDS.template",
+ "TemplateURL" : "https://s3-us-gov-west-1.amazonaws.com/trend-micro-quick-start/v3.2/Common/DB/DSDBOracleRDS.template",
"TimeoutInMinutes" : "10",
"Parameters" : {
"DBIRDSInstanceSize" : {
@@ -156,7 +156,7 @@
"Type" : "AWS::CloudFormation::Stack",
"Condition" : "DBTypeIsSQL",
"Properties" : {
- "TemplateURL" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.2/Common/DB/DSDBSQLRDS.template",
+ "TemplateURL" : "https://s3-us-gov-west-1.amazonaws.com/trend-micro-quick-start/v3.2/Common/DB/DSDBSQLRDS.template",
"TimeoutInMinutes" : "10",
"Parameters" : {
"DBIRDSInstanceSize" : {
diff --git a/DeepSecurity/Common/DSM96ELB.template b/DeepSecurity/Common/DSM96ELB.template
index 8b03bd5..f19260e 100644
--- a/DeepSecurity/Common/DSM96ELB.template
+++ b/DeepSecurity/Common/DSM96ELB.template
@@ -47,7 +47,7 @@
"ELBSG" : {
"Type" : "AWS::CloudFormation::Stack",
"Properties" : {
- "TemplateURL" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.2/Common/SecurityGroups/DSELBSG.template",
+ "TemplateURL" : "https://s3-us-gov-west-1.amazonaws.com/trend-micro-quick-start/v3.2/Common/SecurityGroups/DSELBSG.template",
"Parameters" : {
"AWSIVPC" : {
"Ref" : "AWSIVPC"
diff --git a/DeepSecurity/Common/Scripts/create-console-listener b/DeepSecurity/Common/Scripts/create-console-listener
index 5b53672..c1ee55e 100644
--- a/DeepSecurity/Common/Scripts/create-console-listener
+++ b/DeepSecurity/Common/Scripts/create-console-listener
@@ -4,7 +4,7 @@
if [ $5 -eq 1 ]; then
openssl req -nodes -new -sha256 -newkey rsa:2048 -subj '/CN='DeepSecurityManager'/O=Trend Micro/OU=Deep Security Manager' -keyout /etc/cfn/privatekey -out /etc/cfn/csr;
openssl x509 -req -days 3650 -in /etc/cfn/csr -signkey /etc/cfn/privatekey -out /etc/cfn/certificatebody;
- aws iam upload-server-certificate --server-certificate-name DeepSecurityElbCertificate-$4 --certificate-body file:///etc/cfn/certificatebody --private-key file:///etc/cfn/privatekey
+ aws iam upload-server-certificate --server-certificate-name DeepSecurityElbCertificate-$4 --certificate-body file:///etc/cfn/certificatebody --private-key file:///etc/cfn/privatekey --region $6
fi
loop=1
@@ -15,7 +15,7 @@ do
if [ $loop -eq 1 ]; then echo 'checking for cert availability in iam'; else echo 'cert not yet available in iam'; fi
loop=$((loop+1))
sleep 10
- certid=$(aws iam get-server-certificate --server-certificate-name DeepSecurityElbCertificate-$4 --query ServerCertificate.ServerCertificateMetadata.Arn --output text)
+ certid=$(aws iam get-server-certificate --server-certificate-name DeepSecurityElbCertificate-$4 --query ServerCertificate.ServerCertificateMetadata.Arn --region $6 --output text)
done
loadbalancer=" "
diff --git a/DeepSecurity/Common/Scripts/createCloudAccountGc b/DeepSecurity/Common/Scripts/createCloudAccountGc
new file mode 100644
index 0000000..24a8e33
--- /dev/null
+++ b/DeepSecurity/Common/Scripts/createCloudAccountGc
@@ -0,0 +1,61 @@
+#!/bin/bash
+# createcloudaccount dsmuser dsmpass connectorName guiPort accesskey secretkey
+username=$1
+password=$2
+accesskey=$5
+secretkey=$6
+
+# replace this with your DSM IP or FQDN
+DSMURL="localhost:$4"
+
+# Remove regions you don't want from this list
+#REGIONS=(useast1 uswest1 uswest2 euwest1 apsoutheast1 apsoutheast2 apnortheast1 saeast1 eucentral1 apnortheast2)
+
+# map aws regions to dsm region keys
+#useast1=amazon.cloud.region.key.1
+#uswest2=amazon.cloud.region.key.2
+#uswest1=amazon.cloud.region.key.3
+#euwest1=amazon.cloud.region.key.4
+#apsoutheast1=amazon.cloud.region.key.5
+#apnortheast1=amazon.cloud.region.key.6
+#saeast1=amazon.cloud.region.key.7
+#apsoutheast2=amazon.cloud.region.key.8
+#eucentral1=amazon.cloud.region.key.9
+#apnortheast2=amazon.cloud.region.key.12
+
+# map aws regions to ec2 endpoints
+#useast1ep=ec2.us-east-1.amazonaws.com
+#uswest2ep=ec2.us-west-2.amazonaws.com
+#uswest1ep=ec2.us-west-1.amazonaws.com
+#euwest1ep=ec2.eu-west-1.amazonaws.com
+#apsoutheast1ep=ec2.ap-southeast-1.amazonaws.com
+#apnortheast1ep=ec2.ap-northeast-1.amazonaws.com
+#saeast1ep=ec2.sa-east-1.amazonaws.com
+#apsoutheast2ep=ec2.ap-southeast-2.amazonaws.com
+#eucentral1ep=ec2.eu-central-1.amazonaws.com
+#apnortheast2ep=ec2.ap-northeast-2.amazonaws.com
+
+
+echo "#####Login to DSM"
+tempDSSID=$(curl -k -H "Content-Type: application/json" -X POST "https://$DSMURL/rest/authentication/login/primary" -d "{"dsCredentials":{"userName":"$username","password":"$password"}}")
+
+echo "#####Looping through regions to create connectors"
+#for region in "${REGIONS[@]}"
+#do
+# endpoint="${region}ep"
+# echo "##### creating connector for $region region with endpoint ${!endpoint}"
+# curl -ks -H "Content-Type: application/json" "Accept: application/json" -X POST "https://$DSMURL/rest/cloudaccounts" -d '{"createCloudAccountRequest":{"cloudAccountElement":{"accessKey":"'${accesskey}'","cloudRegion":"'${!region}'","cloudType":"AMAZON","name":"'$3'","secretKey":"'${secretkey}'","endpoint":"'${!endpoint}'","azureCertificate":"-"},"sessionId":"'$tempDSSID'"}}'
+#done
+
+curl -ks -H "Content-Type: application/json" "Accept: application/json" -X POST "https://$DSMURL/rest/cloudaccounts" -d '{"createCloudAccountRequest":{"cloudAccountElement":{"accessKey":"'${accesskey}'","cloudRegion":"'amazon.cloud.region.key.10'","cloudType":"AMAZON","name":"'$3'","secretKey":"'${secretkey}'","endpoint":"'ec2.us-gov-west-1.amazonaws.com'","azureCertificate":"-"},"sessionId":"'$tempDSSID'"}}'
+
+curl -k -X DELETE https://$DSMURL/rest/authentication/logout?sID=$tempDSSID
+
+unset accesskey
+unset secretkey
+unset tempDSSID
+unset username
+unset password
+
+
+
diff --git a/DeepSecurity/Common/Scripts/set-aiaSettings b/DeepSecurity/Common/Scripts/set-aiaSettings
index d4e9d61..bce25ce 100644
--- a/DeepSecurity/Common/Scripts/set-aiaSettings
+++ b/DeepSecurity/Common/Scripts/set-aiaSettings
@@ -24,11 +24,6 @@ curl -k -v -H "Content-Type: text/xml;charset=UTF-8" -H 'SOAPAction: "systemSett
'NONE'\
'2'\
''\
-''\
-'CONFIGURATION_AGENTCOMMUNICATIONS'\
-'NONE'\
-'1'\
-''\
''${SID}''\
''\
''\
diff --git a/DeepSecurity/DeepSecurity.cfproj b/DeepSecurity/DeepSecurity.cfproj
index 29f179b..7262073 100644
--- a/DeepSecurity/DeepSecurity.cfproj
+++ b/DeepSecurity/DeepSecurity.cfproj
@@ -63,6 +63,9 @@
Code
+
+ Code
+
Code
@@ -89,6 +92,9 @@
Content
+
+ Content
+
Content
diff --git a/DeepSecurity/Quickstart/TMQuickStartRHEL-gc.template b/DeepSecurity/Quickstart/TMQuickStartRHEL-gc.template
new file mode 100644
index 0000000..c63d7b8
--- /dev/null
+++ b/DeepSecurity/Quickstart/TMQuickStartRHEL-gc.template
@@ -0,0 +1,358 @@
+{
+ "AWSTemplateFormatVersion" : "2010-09-09",
+ "Description" : "v3.2 Quick Start that deploys Trend Micro Deep Security into an exisintg VPC with a Multi-AZ Oracle RDS instance **WARNING** This template uses images from the AWS Marketplace and an active subscription is required - Please see the Quick Start documentation for more details. You will be billed for the AWS resources used if you create a stack from this template.",
+ "Metadata" : {
+ "AWS::CloudFormation::Interface" : {
+ "ParameterGroups" : [
+ {
+ "Label" : { "default" : "Deep Security Manager Configuration" },
+ "Parameters" : [ "DeepSecurityAdminName", "DeepSecurityAdminPass", "AWSKeyPairName", "ProtectedInstances" ]
+ },
+ {
+ "Label" : { "default" : "Network Configuration" },
+ "Parameters" : [ "AWSVPC", "DeepSecuritySubnet", "DatabaseSubnet1", "DatabaseSubnet2" ]
+ }
+
+ ],
+ "ParameterLabels" : {
+ "AWSKeyPairName" : { "default" : "EC2 Key Pair for SSH access" },
+ "AWSVPC" : { "default" : "VPC for Deep Security Components" },
+ "DeepSecuritySubnet" : { "default" : "Public Subnet for Deep Security Managers" },
+ "DeepSecurityAdminName" : { "default" : "Administrator username for Deep Security" },
+ "DeepSecurityAdminPass" : { "default" : "Administrator password for Deep Security" },
+ "DatabaseSubnet1" : { "default" : "Primary private subnet for RDS" },
+ "DatabaseSubnet2" : { "default" : "Secondary private subnet for RDS" },
+ "ProtectedInstances" : { "default" : "Number of instances you expect to protect with Deep Security Agents" }
+ }
+ }
+ },
+ "Parameters" : {
+ "AWSKeyPairName" : {
+ "Description" : "Select an existing key pair to use for connecting to your Deep Security Manager Instance.",
+ "Type" : "AWS::EC2::KeyPair::KeyName",
+ "MinLength" : "1",
+ "MaxLength" : "255",
+ "AllowedPattern" : "[-_a-zA-Z0-9]*",
+ "ConstraintDescription" : "Select an existing EC2 Key Pair."
+ },
+ "AWSVPC" : {
+ "Description" : "Select an existing VPC to deploy Deep Security Manager.",
+ "Type" : "AWS::EC2::VPC::Id",
+ "MinLength" : "1",
+ "MaxLength" : "255",
+ "AllowedPattern" : "[-_a-zA-Z0-9]*"
+ },
+ "DatabaseSubnet1" : {
+ "Description" : "Select a private subnet for the RDS database. Must be a private subnet contained the in VPC chosen above.",
+ "Type" : "AWS::EC2::Subnet::Id",
+ "ConstraintDescription" : "RDS Subnet Groups must be comprised of 2 subnets in seperate availability zones within the specified VPC for deploying this template"
+ },
+ "DatabaseSubnet2" : {
+ "Description" : "Select a second private subnet for the RDS database. Must be a private subnet contained the in VPC chosen above.",
+ "Type" : "AWS::EC2::Subnet::Id",
+ "ConstraintDescription" : "RDS Subnet Groups must be comprised of 2 subnets in seperate availability zones within the specified VPC for deploying this template"
+ },
+ "DeepSecuritySubnet" : {
+ "Description" : "Select an existing Subnet for Deep Seucurity Manager. Must be a public subnet contained the in VPC chosen above.",
+ "Type" : "AWS::EC2::Subnet::Id",
+ "MinLength" : "1",
+ "MaxLength" : "255",
+ "AllowedPattern" : "[-_a-zA-Z0-9]*",
+ "ConstraintDescription" : "Subnet ID must exist in the chosen VPC"
+ },
+ "DeepSecurityAdminName" : {
+ "Default" : "MasterAdmin",
+ "NoEcho" : false,
+ "Description" : "The Deep Security Manager administrator username for Web Console Access.",
+ "Type" : "String",
+ "MinLength" : 1,
+ "MaxLength" : 16,
+ "AllowedPattern" : "[a-zA-Z][a-zA-Z0-9]*",
+ "ConstraintDescription" : "Must begin with a letter and contain only alphanumeric characters. Min length 1, max length 16"
+ },
+ "DeepSecurityAdminPass" : {
+ "NoEcho" : true,
+ "Description" : "The Deep Security Manager administrator password. Must be 8-41 characters long and can only contain alphanumeric characters or the following special characters !^*-_+",
+ "Type" : "String",
+ "MinLength" : 8,
+ "MaxLength" : 41,
+ "AllowedPattern" : "[a-zA-Z0-9!^*\\-_+]*",
+ "ConstraintDescription" : "Can only contain alphanumeric characters or the following special characters !^*-_+ Min length 8, max length 41"
+ },
+ "ProtectedInstances" : {
+ "Description" : "Select how many instances would you like to protect.",
+ "Type" : "String",
+ "AllowedValues" : [
+ "1-100",
+ "101-500",
+ "501-1000",
+ "1001-2000"
+ ]
+ }
+ },
+ "Mappings" : {
+ "DSMSIZE" : {
+ "us-east-1" : {
+ "1" : "m3.large",
+ "2" : "m3.large",
+ "3" : "c3.xlarge",
+ "4" : "c3.xlarge"
+ },
+ "us-west-1" : {
+ "1" : "m3.large",
+ "2" : "m3.large",
+ "3" : "c3.xlarge",
+ "4" : "c3.xlarge"
+ },
+ "us-west-2" : {
+ "1" : "m3.large",
+ "2" : "m3.large",
+ "3" : "c3.xlarge",
+ "4" : "c3.xlarge"
+ },
+ "eu-west-1" : {
+ "1" : "m3.large",
+ "2" : "m3.large",
+ "3" : "c3.xlarge",
+ "4" : "c3.xlarge"
+ },
+ "eu-central-1" : {
+ "1" : "m3.large",
+ "2" : "m3.large",
+ "3" : "c3.xlarge",
+ "4" : "c3.xlarge"
+ },
+ "sa-east-1" : {
+ "1" : "m3.large",
+ "2" : "m3.large",
+ "3" : "c3.xlarge",
+ "4" : "c3.xlarge"
+ },
+ "ap-northeast-1" : {
+ "1" : "m3.large",
+ "2" : "m3.large",
+ "3" : "c3.xlarge",
+ "4" : "c3.xlarge"
+ },
+ "ap-southeast-1" : {
+ "1" : "m3.large",
+ "2" : "m3.large",
+ "3" : "c3.xlarge",
+ "4" : "c3.xlarge"
+ },
+ "ap-southeast-2" : {
+ "1" : "m3.large",
+ "2" : "m3.large",
+ "3" : "c3.xlarge",
+ "4" : "c3.xlarge"
+ },
+ "ap-northeast-2" : {
+ "1" : "m4.large",
+ "2" : "m4.large",
+ "3" : "m4.xlarge",
+ "4" : "m4.xlarge"
+ },
+ "us-gov-west-1" : {
+ "1" : "m3.large",
+ "2" : "m3.large",
+ "3" : "m3.xlarge",
+ "4" : "m3.xlarge"
+ }
+ },
+ "RDSStorageSize" : {
+ "1-100" : {
+ "Size" : "50"
+ },
+ "101-500" : {
+ "Size" : "150"
+ },
+ "501-1000" : {
+ "Size" : "200"
+ },
+ "1001-2000" : {
+ "Size" : "300"
+ }
+ },
+ "RDSInstanceSize" : {
+ "us-east-1" : {
+ "1" : "db.m4.large",
+ "2" : "db.m4.large",
+ "3" : "db.m4.xlarge",
+ "4" : "db.m4.xlarge"
+ },
+ "us-west-1" : {
+ "1" : "db.m4.large",
+ "2" : "db.m4.large",
+ "3" : "db.m4.xlarge",
+ "4" : "db.m4.xlarge"
+ },
+ "us-west-2" : {
+ "1" : "db.m4.large",
+ "2" : "db.m4.large",
+ "3" : "db.m4.xlarge",
+ "4" : "db.m4.xlarge"
+ },
+ "eu-west-1" : {
+ "1" : "db.m4.large",
+ "2" : "db.m4.large",
+ "3" : "db.m4.xlarge",
+ "4" : "db.m4.xlarge"
+ },
+ "eu-central-1" : {
+ "1" : "db.m4.large",
+ "2" : "db.m4.large",
+ "3" : "db.m4.xlarge",
+ "4" : "db.m4.xlarge"
+ },
+ "sa-east-1" : {
+ "1" : "db.m3.large",
+ "2" : "db.m3.large",
+ "3" : "db.m3.xlarge",
+ "4" : "db.m3.xlarge"
+ },
+ "ap-northeast-1" : {
+ "1" : "db.m4.large",
+ "2" : "db.m4.large",
+ "3" : "db.m4.xlarge",
+ "4" : "db.m4.xlarge"
+ },
+ "ap-southeast-1" : {
+ "1" : "db.m4.large",
+ "2" : "db.m4.large",
+ "3" : "db.m4.xlarge",
+ "4" : "db.m4.xlarge"
+ },
+ "ap-southeast-2" : {
+ "1" : "db.m3.large",
+ "2" : "db.m3.large",
+ "3" : "db.m3.xlarge",
+ "4" : "db.m3.xlarge"
+ },
+ "ap-northeast-2" : {
+ "1" : "db.m4.large",
+ "2" : "db.m4.large",
+ "3" : "db.m4.xlarge",
+ "4" : "db.m4.xlarge"
+ },
+ "us-gov-west-1" : {
+ "1" : "db.m3.large",
+ "2" : "db.m3.large",
+ "3" : "db.m3.xlarge",
+ "4" : "db.m3.xlarge"
+ }
+ },
+ "DeploymentSize" : {
+ "1-100" : {
+ "Size" : "1"
+ },
+ "101-500" : {
+ "Size" : "2"
+ },
+ "501-1000" : {
+ "Size" : "3"
+ },
+ "1001-2000" : {
+ "Size" : "4"
+ }
+ }
+ },
+ "Resources" : {
+ "MasterRH96" : {
+ "Type" : "AWS::CloudFormation::Stack",
+ "Properties" : {
+ "TemplateURL" : "https://s3-us-gov-west-1.amazonaws.com/trend-micro-quick-start/v3.2/RHEL/MasterRH96.template",
+ "Parameters" : {
+ "AWSIKeyPairName" : {
+ "Ref" : "AWSKeyPairName"
+ },
+ "AWSIVPC" : {
+ "Ref" : "AWSVPC"
+ },
+ "DSISubnetID" : {
+ "Ref" : "DeepSecuritySubnet"
+ },
+ "DBIRDSInstanceSize" : {
+ "Fn::FindInMap" : [
+ "RDSInstanceSize",
+ {
+ "Ref" : "AWS::Region"
+ },
+ {
+ "Fn::FindInMap" : [
+ "DeploymentSize",
+ {
+ "Ref" : "ProtectedInstances"
+ },
+ "Size"
+ ]
+ }
+ ]
+ },
+ "DBIStorageAllocation" : {
+ "Fn::FindInMap" : [
+ "RDSStorageSize",
+ {
+ "Ref" : "ProtectedInstances"
+ },
+ "Size"
+ ]
+ },
+ "DBPBackupDays" : "5",
+ "DBPCreateDbInstance" : "Yes" ,
+ "DBICAdminName" : "dsmadmin",
+ "DBICAdminPassword" : {
+ "Ref" : "DeepSecurityAdminPass"
+ },
+ "DBPEngine" : "Oracle",
+ "DBPEndpoint" : "" ,
+ "DBPName" :"dsm",
+ "DSCAdminName" : {
+ "Ref" : "DeepSecurityAdminName"
+ },
+ "DSCAdminPassword" : {
+ "Ref" : "DeepSecurityAdminPass"
+ },
+ "DSIMultiNode" : "2" ,
+ "DSIPLicenseKey" : "XX-XXXX-XXXXX-XXXXX-XXXXX-XXXXX-XXXXX",
+ "DSIPHeartbeatPort" : "4120",
+ "DSIPGUIPort" : "443",
+ "DSIPInstanceType" : {
+ "Fn::FindInMap" : [
+ "DSMSIZE",
+ {
+ "Ref" : "AWS::Region"
+ },
+ {
+ "Fn::FindInMap" : [
+ "DeploymentSize",
+ {
+ "Ref" : "ProtectedInstances"
+ },
+ "Size"
+ ]
+ }
+ ]
+ },
+ "DBISubnet1" : {
+ "Ref" : "DatabaseSubnet1"
+ },
+ "DBISubnet2" : {
+ "Ref" : "DatabaseSubnet2"
+ },
+ "DBIInstanceIdentifier" : "deep-security",
+ "DBPMultiAZ": "true"
+ }
+ }
+ }
+ },
+ "Outputs" : {
+ "DeepSecurityConsole" : {
+ "Value" : {
+ "Fn::GetAtt" : [
+ "MasterRH96",
+ "Outputs.DeepSecurityConsole"
+ ]
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/DeepSecurity/RHEL/DSM96RH.template b/DeepSecurity/RHEL/DSM96RH.template
index 31f0536..6182d13 100644
--- a/DeepSecurity/RHEL/DSM96RH.template
+++ b/DeepSecurity/RHEL/DSM96RH.template
@@ -216,7 +216,10 @@
},
"ap-southeast-1" : {
"64" : "ami-3f03c55c"
- }
+ },
+ "us-gov-west-1" : {
+ "64" : "ami-299e2248"
+ }
},
"TrendRegionMap" : {
"us-east-1" : {
@@ -362,7 +365,7 @@
"Fn::Join" : [
"",
[
- "arn:aws:elasticloadbalancing:",
+ "arn:aws-us-gov:elasticloadbalancing:",
{
"Ref" : "AWS::Region"
},
@@ -390,7 +393,7 @@
"Fn::Join" : [
"",
[
- "arn:aws:elasticloadbalancing:",
+ "arn:aws-us-gov:elasticloadbalancing:",
{
"Ref" : "AWS::Region"
},
@@ -416,7 +419,7 @@
"Fn::Join" : [
"",
[
- "arn:aws:iam::",
+ "arn:aws-us-gov:iam::",
{
"Ref" : "AWS::AccountId"
},
@@ -714,7 +717,7 @@
"installDSM" : {
"files" : {
"/etc/systemd/system/dsm_s.service" : {
- "source" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.2/Common/Scripts/dsm_s.service",
+ "source" : "https://s3-us-gov-west-1.amazonaws.com/trend-micro-quick-start/v3.2/Common/Scripts/dsm_s.service",
"owner" : "root",
"mode" : "00755"
}
@@ -747,17 +750,17 @@
"addCloudAccount" : {
"files" : {
"/etc/cfn/set-aiaSettings" : {
- "source" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.2/Common/Scripts/set-aiaSettings",
+ "source" : "https://s3-us-gov-west-1.amazonaws.com/trend-micro-quick-start/v3.2/Common/Scripts/set-aiaSettings",
"owner" : "root",
"mode" : "000700"
},
"/etc/cfn/createCloudAccount" : {
- "source" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.2/Common/Scripts/createCloudAccount",
+ "source" : "https://s3-us-gov-west-1.amazonaws.com/trend-micro-quick-start/v3.2/Common/Scripts/createCloudAccountGc",
"owner" : "root",
"mode" : "000700"
},
"/etc/cfn/wait-for-relay-and-stop-manager" : {
- "source" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.2/Common/Scripts/wait-for-relay-and-stop-manager",
+ "source" : "https://s3-us-gov-west-1.amazonaws.com/trend-micro-quick-start/v3.2/Common/Scripts/wait-for-relay-and-stop-manager",
"owner" : "root",
"mode" : "000700"
}
@@ -852,7 +855,7 @@
"sqlSetup" : {
"commands" : {
"1-get-sql-helper" : {
- "command" : "cd /etc/cfn/rhel-scripts; curl -O https://s3.amazonaws.com/trend-micro-quick-start/v3.2/Common/Scripts/cfn-rh-sql; chmod 775 cfn-rh-sql",
+ "command" : "cd /etc/cfn/rhel-scripts; curl -O https://s3-us-gov-west-1.amazonaws.com/trend-micro-quick-start/v3.2/Common/Scripts/cfn-rh-sql; chmod 775 cfn-rh-sql",
"ignoreErrors" : "false"
},
"2-run-helper" : {
@@ -922,12 +925,12 @@
"fixManagerLoadBalancerSettings" : {
"files" : {
"/etc/cfn/create-console-listener" : {
- "source" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.2/Common/Scripts/create-console-listener",
+ "source" : "https://s3-us-gov-west-1.amazonaws.com/trend-micro-quick-start/v3.2/Common/Scripts/create-console-listener",
"owner" : "root",
"mode" : "000700"
},
"/etc/cfn/set-lbSettings" : {
- "source" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.2/Common/Scripts/set-lbSettings",
+ "source" : "https://s3-us-gov-west-1.amazonaws.com/trend-micro-quick-start/v3.2/Common/Scripts/set-lbSettings",
"owner" : "root",
"mode" : "000700"
}
@@ -1050,7 +1053,7 @@
"fixManagerHostObject" : {
"files" : {
"/etc/cfn/reactivate-manager" : {
- "source" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.2/Common/Scripts/reactivate-manager",
+ "source" : "https://s3-us-gov-west-1.amazonaws.com/trend-micro-quick-start/v3.2/Common/Scripts/reactivate-manager",
"owner" : "root",
"mode" : "000700"
}
@@ -1121,7 +1124,7 @@
[
"#!/bin/bash -xe\n",
"# cloud-init\n",
- "curl -O https://s3.amazonaws.com/trend-micro-quick-start/v3.2/Common/Scripts/cfn-rh-helper\n",
+ "curl -O https://s3-us-gov-west-1.amazonaws.com/trend-micro-quick-start/v3.2/Common/Scripts/cfn-rh-helper\n",
"sh cfn-rh-helper >> cfn-rh-helper.log\n",
"cfn-init -v ",
" --stack ",
diff --git a/DeepSecurity/RHEL/MasterRH96.template b/DeepSecurity/RHEL/MasterRH96.template
index 6b609c4..df55776 100644
--- a/DeepSecurity/RHEL/MasterRH96.template
+++ b/DeepSecurity/RHEL/MasterRH96.template
@@ -73,6 +73,10 @@
"Description" : "Trend Micro Deep Security Database instance class",
"Type" : "String",
"AllowedValues" : [
+ "db.m4.medium",
+ "db.m4.large",
+ "db.m4.xlarge",
+ "db.m4.2xlarge",
"db.m3.medium",
"db.m3.large",
"db.m3.xlarge",
@@ -274,7 +278,7 @@
],
"Condition" : "LaunchRDSInstance",
"Properties" : {
- "TemplateURL" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.2/RHEL/DSM96RH.template",
+ "TemplateURL" : "https://s3-us-gov-west-1.amazonaws.com/trend-micro-quick-start/v3.2/RHEL/DSM96RH.template",
"Parameters" : {
"AWSIKeyPairName" : {
"Ref" : "AWSIKeyPairName"
@@ -367,7 +371,7 @@
],
"Condition" : "DSM96Node2DB",
"Properties" : {
- "TemplateURL" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.2/RHEL/DSM96RH.template",
+ "TemplateURL" : "https://s3-us-gov-west-1.amazonaws.com/trend-micro-quick-start/v3.2/RHEL/DSM96RH.template",
"Parameters" : {
"AWSIKeyPairName" : {
"Ref" : "AWSIKeyPairName"
@@ -450,7 +454,7 @@
],
"Condition" : "DoNotLaunchRDSInstance",
"Properties" : {
- "TemplateURL" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.2/RHEL/DSM96RH.template",
+ "TemplateURL" : "https://s3-us-gov-west-1.amazonaws.com/trend-micro-quick-start/v3.2/RHEL/DSM96RH.template",
"Parameters" : {
"AWSIKeyPairName" : {
"Ref" : "AWSIKeyPairName"
@@ -537,7 +541,7 @@
"DependsOn" : "DSM1NoDBCompleteWaitCondition",
"Condition" : "DSM96Node2NoDB",
"Properties" : {
- "TemplateURL" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.2/RHEL/DSM96RH.template",
+ "TemplateURL" : "https://s3-us-gov-west-1.amazonaws.com/trend-micro-quick-start/v3.2/RHEL/DSM96RH.template",
"Parameters" : {
"AWSIKeyPairName" : {
"Ref" : "AWSIKeyPairName"
@@ -615,7 +619,7 @@
"Condition" : "LaunchRDSInstance",
"DependsOn" : "DSIRDSSecurityGroup",
"Properties" : {
- "TemplateURL" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.2/Common/DB/DSDBAbstract.template",
+ "TemplateURL" : "https://s3-us-gov-west-1.amazonaws.com/trend-micro-quick-start/v3.2/Common/DB/DSDBAbstract.template",
"Parameters" : {
"DBPName" : {
"Ref" : "DBPName"
@@ -662,7 +666,7 @@
"Type" : "AWS::CloudFormation::Stack",
"Condition" : "LaunchRDSInstance",
"Properties" : {
- "TemplateURL" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.2/Common/SecurityGroups/RDSSecurityGroup.template",
+ "TemplateURL" : "https://s3-us-gov-west-1.amazonaws.com/trend-micro-quick-start/v3.2/Common/SecurityGroups/RDSSecurityGroup.template",
"Parameters" : {
"AWSIVPC" : {
"Ref" : "AWSIVPC"
@@ -682,7 +686,7 @@
"DSIDSMSecurityGroup" : {
"Type" : "AWS::CloudFormation::Stack",
"Properties" : {
- "TemplateURL" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.2/Common/SecurityGroups/DSMSecurityGroup.template",
+ "TemplateURL" : "https://s3-us-gov-west-1.amazonaws.com/trend-micro-quick-start/v3.2/Common/SecurityGroups/DSMSecurityGroup.template",
"Parameters" : {
"AWSIVPC" : {
"Ref" : "AWSIVPC"
@@ -699,7 +703,7 @@
"DSIELB" : {
"Type" : "AWS::CloudFormation::Stack",
"Properties" : {
- "TemplateURL" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.2/Common/DSM96ELB.template",
+ "TemplateURL" : "https://s3-us-gov-west-1.amazonaws.com/trend-micro-quick-start/v3.2/Common/DSM96ELB.template",
"Parameters" : {
"AWSIVPC" : {
"Ref" : "AWSIVPC"
@@ -720,7 +724,7 @@
"DSIDSMSecurityGroupIngressRules" : {
"Type" : "AWS::CloudFormation::Stack",
"Properties" : {
- "TemplateURL" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.2/Common/SecurityGroups/DSMSGIngressRules.template",
+ "TemplateURL" : "https://s3-us-gov-west-1.amazonaws.com/trend-micro-quick-start/v3.2/Common/SecurityGroups/DSMSGIngressRules.template",
"Parameters" : {
"DSMSG" : {
"Fn::GetAtt" : [