Skip to content
This repository was archived by the owner on Oct 4, 2024. It is now read-only.

Commit 3a36634

Browse files
trend-scott-broschelltrend-scott-broschell
committed
Updates from Pull Request comments
1 parent 7892a20 commit 3a36634

14 files changed

+304
-256
lines changed

‎templates/Common/DB/DSDBAbstract.template‎

Lines changed: 45 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
AWSTemplateFormatVersion: 2010-09-09
22
Description: >-
33
v5.3: This template is an abstraction layer for choosing PostgreSQL, Oracle or
4-
MSSQL when deploying Deep Security Manager
4+
MSSQL when deploying Deep Security Manager (qs-1ngr590i4).
55
Parameters:
66
DBIRDSInstanceSize:
77
Default: db.m3.large
@@ -92,26 +92,45 @@ Parameters:
9292
Description: Choose a private subnets in the same VPC for the RDS instance
9393
Type: 'AWS::EC2::Subnet::Id'
9494
ConstraintDescription: >-
95-
RDS Subnet Groups must be comprised of 2 subnets in seperate availability
95+
RDS Subnet Groups must be comprised of 2 subnets in separate availability
9696
zones with the specified VPC for deploying this template
9797
DBISubnet2:
9898
Description: Choose private subnets in the same VPC for this RDS instance
9999
Type: 'AWS::EC2::Subnet::Id'
100100
ConstraintDescription: >-
101-
RDS Subnet Groups must be comprised of 2 subnets in seperate availability
101+
RDS Subnet Groups must be comprised of 2 subnets in separate availability
102102
zones with the specified VPC for deploying this template
103-
CfnUrlPrefix:
103+
QSS3BucketName:
104+
AllowedPattern: ^[0-9a-zA-Z]+([0-9a-zA-Z-]*[0-9a-zA-Z])*$
105+
ConstraintDescription: Quick Start bucket name can include numbers, lowercase letters,
106+
uppercase letters, and hyphens (-). It cannot start or end with a hyphen (-).
107+
Default: quickstart-reference
108+
Description: S3 bucket name for the Quick Start assets. Quick Start bucket name
109+
can include numbers, lowercase letters, uppercase letters, and hyphens (-).
110+
It cannot start or end with a hyphen (-).
111+
Type: String
112+
QSS3KeyPrefix:
113+
AllowedPattern: ^[0-9a-zA-Z-]+(/[0-9a-zA-Z-]+)*$
114+
ConstraintDescription: Quick Start key prefix can include numbers, lowercase letters,
115+
uppercase letters, hyphens (-), and forward slash (/). It cannot start or end
116+
with forward slash (/) because they are automatically appended.
117+
Default: trendmicro/deepsecurity/latest
118+
Description: S3 key prefix for the Quick Start assets. Quick Start key prefix can
119+
include numbers, lowercase letters, uppercase letters, hyphens (-), and forward slash
120+
(/).
104121
Type: String
105-
Default: 'https://s3.amazonaws.com/trend-micro-quick-start/latest/'
106122
Resources:
107123
DSOracleRDS:
108124
Type: 'AWS::CloudFormation::Stack'
109125
Condition: DBTypeIsOracle
110126
Properties:
111-
TemplateURL: !Join
112-
- ''
113-
- - !Ref CfnUrlPrefix
114-
- templates/common/db/DSDBOracleRDS.template
127+
TemplateURL: !Sub
128+
- >-
129+
https://${QSS3BucketName}.${QSS3Region}.amazonaws.com/${QSS3KeyPrefix}/templates/common/db/DSDBOracleRDS.template
130+
- QSS3Region: !If
131+
- GovCloudCondition
132+
- s3-us-gov-west-1
133+
- s3
115134
TimeoutInMinutes: '10'
116135
Parameters:
117136
DBIRDSInstanceSize: !Ref DBIRDSInstanceSize
@@ -127,10 +146,13 @@ Resources:
127146
Type: 'AWS::CloudFormation::Stack'
128147
Condition: DBTypeIsSQL
129148
Properties:
130-
TemplateURL: !Join
131-
- ''
132-
- - !Ref CfnUrlPrefix
133-
- templates/common/db/DSDBSQLRDS.template
149+
TemplateURL: !Sub
150+
- >-
151+
https://${QSS3BucketName}.${QSS3Region}.amazonaws.com/${QSS3KeyPrefix}/templates/common/db/DSDBSQLRDS.template
152+
- QSS3Region: !If
153+
- GovCloudCondition
154+
- s3-us-gov-west-1
155+
- s3
134156
TimeoutInMinutes: '10'
135157
Parameters:
136158
DBIRDSInstanceSize: !Ref DBIRDSInstanceSize
@@ -146,10 +168,13 @@ Resources:
146168
Type: 'AWS::CloudFormation::Stack'
147169
Condition: DBTypeIsPostgreSQL
148170
Properties:
149-
TemplateURL: !Join
150-
- ''
151-
- - !Ref CfnUrlPrefix
152-
- templates/common/db/DSDBPostgreSQL.template
171+
TemplateURL: !Sub
172+
- >-
173+
https://${QSS3BucketName}.${QSS3Region}.amazonaws.com/${QSS3KeyPrefix}/templates/common/db/DSDBPostgreSQL.template
174+
- QSS3Region: !If
175+
- GovCloudCondition
176+
- s3-us-gov-west-1
177+
- s3
153178
TimeoutInMinutes: '10'
154179
Parameters:
155180
DBIRDSInstanceSize: !Ref DBIRDSInstanceSize
@@ -178,6 +203,9 @@ Conditions:
178203
DBTypeIsPostgreSQL: !Equals
179204
- !Ref DBPEngine
180205
- PostgreSQL
206+
GovCloudCondition: !Equals
207+
- !Ref 'AWS::Region'
208+
- us-gov-west-1
181209
Outputs:
182210
DSDBEndpoint:
183211
Value: !If

‎templates/Common/DB/DSDBOracleRDS.template‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
AWSTemplateFormatVersion: 2010-09-09
2-
Description: 'v5.3: This template deploys an Oracle RDS instance for Deep Security Manager'
2+
Description: >-
3+
v5.3: This template deploys an Oracle RDS instance for Deep Security Manager (qs-1ngr590i9).
34
Parameters:
45
DBIRDSInstanceSize:
56
Default: db.m3.large

‎templates/Common/DB/DSDBSQLRDS.template‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
AWSTemplateFormatVersion: 2010-09-09
2-
Description: 'v5.3: This template deploys an MSSQL RDS Instance for Deep Security Manager'
2+
Description: >-
3+
v5.3: This template deploys an MSSQL RDS Instance for Deep Security Manager (qs-1ngr590ij).
34
Parameters:
45
DBIRDSInstanceSize:
56
Default: db.m3.large

‎templates/Common/DSMELB.template‎

Lines changed: 29 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
AWSTemplateFormatVersion: 2010-09-09
22
Description: >-
3-
v5.3: Deploys Elastic Load Balancers and Security Groups for Deep Security
3+
v5.3: Deploys Elastic Load Balancers and Security Groups for Deep Security (qs-1ngr590je).
44
Manager.
55
Parameters:
66
AWSIVPC:
@@ -41,17 +41,36 @@ Parameters:
4141
- Internet-facing
4242
- Internal
4343
Default: Internet-facing
44-
CfnUrlPrefix:
44+
QSS3BucketName:
45+
AllowedPattern: ^[0-9a-zA-Z]+([0-9a-zA-Z-]*[0-9a-zA-Z])*$
46+
ConstraintDescription: Quick Start bucket name can include numbers, lowercase letters,
47+
uppercase letters, and hyphens (-). It cannot start or end with a hyphen (-).
48+
Default: quickstart-reference
49+
Description: S3 bucket name for the Quick Start assets. Quick Start bucket name
50+
can include numbers, lowercase letters, uppercase letters, and hyphens (-).
51+
It cannot start or end with a hyphen (-).
52+
Type: String
53+
QSS3KeyPrefix:
54+
AllowedPattern: ^[0-9a-zA-Z-]+(/[0-9a-zA-Z-]+)*$
55+
ConstraintDescription: Quick Start key prefix can include numbers, lowercase letters,
56+
uppercase letters, hyphens (-), and forward slash (/). It cannot start or end
57+
with forward slash (/) because they are automatically appended.
58+
Default: trendmicro/deepsecurity/latest
59+
Description: S3 key prefix for the Quick Start assets. Quick Start key prefix can
60+
include numbers, lowercase letters, uppercase letters, hyphens (-), and forward slash
61+
(/).
4562
Type: String
46-
Default: 'https://s3.amazonaws.com/trend-micro-quick-start/latest/'
4763
Resources:
4864
ELBSG:
4965
Type: 'AWS::CloudFormation::Stack'
5066
Properties:
51-
TemplateURL: !Join
52-
- ''
53-
- - !Ref CfnUrlPrefix
54-
- templates/common/security-groups/DSELBSG.template
67+
TemplateURL: !Sub
68+
- >-
69+
https://${QSS3BucketName}.${QSS3Region}.amazonaws.com/${QSS3KeyPrefix}/templates/common/security-groups/DSELBSG.template
70+
- QSS3Region: !If
71+
- GovCloudCondition
72+
- s3-us-gov-west-1
73+
- s3
5574
Parameters:
5675
AWSIVPC: !Ref AWSIVPC
5776
DSIPGUIPort: !Ref DSIPGUIPort
@@ -93,6 +112,9 @@ Conditions:
93112
InternetFacingELB: !Equals
94113
- !Ref DSELBPosture
95114
- Internet-facing
115+
GovCloudCondition: !Equals
116+
- !Ref 'AWS::Region'
117+
- us-gov-west-1
96118
Outputs:
97119
ELBFQDN:
98120
Value: !GetAtt

‎templates/Common/sps.template‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
AWSTemplateFormatVersion: 2010-09-09
2-
Description: ''
2+
Description: >-
3+
v5.3: Smart protection server template (qs-1ngr590jj).
34
Parameters:
45
AWSIKeyPairName:
56
Description: Existing key pair to use for connecting to your Smart Protection Server

‎templates/Marketplace/DSMMP.template‎

Lines changed: 72 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Description: >-
44
nested in a stack, and requires several passed parameters to launch.
55
**WARNING** This template creates Amazon EC2 instances and related resources.
66
You will be billed for the AWS resources used if you create a stack from this
7-
template.
7+
template (qs-1ngr590jo).
88
Parameters:
99
AWSIKeyPairName:
1010
Description: >-
@@ -187,9 +187,25 @@ Parameters:
187187
- Internet-facing
188188
- Internal
189189
Default: Internet-facing
190-
CfnUrlPrefix:
190+
QSS3BucketName:
191+
AllowedPattern: ^[0-9a-zA-Z]+([0-9a-zA-Z-]*[0-9a-zA-Z])*$
192+
ConstraintDescription: Quick Start bucket name can include numbers, lowercase letters,
193+
uppercase letters, and hyphens (-). It cannot start or end with a hyphen (-).
194+
Default: quickstart-reference
195+
Description: S3 bucket name for the Quick Start assets. Quick Start bucket name
196+
can include numbers, lowercase letters, uppercase letters, and hyphens (-).
197+
It cannot start or end with a hyphen (-).
198+
Type: String
199+
QSS3KeyPrefix:
200+
AllowedPattern: ^[0-9a-zA-Z-]+(/[0-9a-zA-Z-]+)*$
201+
ConstraintDescription: Quick Start key prefix can include numbers, lowercase letters,
202+
uppercase letters, hyphens (-), and forward slash (/). It cannot start or end
203+
with forward slash (/) because they are automatically appended.
204+
Default: trendmicro/deepsecurity/latest
205+
Description: S3 key prefix for the Quick Start assets. Quick Start key prefix can
206+
include numbers, lowercase letters, uppercase letters, hyphens (-), and forward slash
207+
(/).
191208
Type: String
192-
Default: 'https://s3.amazonaws.com/trend-micro-quick-start/latest/'
193209
DSCLicenseType:
194210
Type: String
195211
Default: Enterprise
@@ -580,24 +596,33 @@ Resources:
580596
addCloudAccount:
581597
files:
582598
/etc/cfn/set-aia-settings.sh:
583-
source: !Join
584-
- ''
585-
- - !Ref CfnUrlPrefix
586-
- scripts/set-aia-settings.sh
599+
source: !Sub
600+
- >-
601+
https://${QSS3BucketName}.${QSS3Region}.amazonaws.com/${QSS3KeyPrefix}/scripts/set-aia-settings.sh
602+
- QSS3Region: !If
603+
- GovCloudCondition
604+
- s3-us-gov-west-1
605+
- s3
587606
owner: root
588607
mode: '000700'
589608
/etc/cfn/kill-mp-web-installer.sh:
590-
source: !Join
591-
- ''
592-
- - !Ref CfnUrlPrefix
593-
- scripts/kill-mp-web-installer.sh
609+
source: !Sub
610+
- >-
611+
https://${QSS3BucketName}.${QSS3Region}.amazonaws.com/${QSS3KeyPrefix}/scripts/kill-mp-web-installer.sh
612+
- QSS3Region: !If
613+
- GovCloudCondition
614+
- s3-us-gov-west-1
615+
- s3
594616
owner: root
595617
mode: '000700'
596618
/etc/cfn/add-aws-account-with-instance-role.sh:
597-
source: !Join
598-
- ''
599-
- - !Ref CfnUrlPrefix
600-
- scripts/add-aws-account-with-instance-role.sh
619+
source: !Sub
620+
- >-
621+
https://${QSS3BucketName}.${QSS3Region}.amazonaws.com/${QSS3KeyPrefix}/scripts/add-aws-account-with-instance-role.sh
622+
- QSS3Region: !If
623+
- GovCloudCondition
624+
- s3-us-gov-west-1
625+
- s3
601626
owner: root
602627
mode: '000700'
603628
commands:
@@ -640,8 +665,14 @@ Resources:
640665
command: !Join
641666
- ''
642667
- - 'cd /etc/cfn/rhel-scripts; curl -O '
643-
- !Ref CfnUrlPrefix
644-
- scripts/create-dsm-db.py; chmod 755 create-dsm-db.py
668+
- !Sub
669+
- >-
670+
https://${QSS3BucketName}.${QSS3Region}.amazonaws.com/${QSS3KeyPrefix}/scripts/create-dsm-db.py
671+
- QSS3Region: !If
672+
- GovCloudCondition
673+
- s3-us-gov-west-1
674+
- s3
675+
- ' chmod 755 create-dsm-db.py'
645676
ignoreErrors: 'false'
646677
2-create-db:
647678
command: !Join
@@ -670,17 +701,23 @@ Resources:
670701
fixManagerLoadBalancerSettings:
671702
files:
672703
/etc/cfn/create-console-listener.sh:
673-
source: !Join
674-
- ''
675-
- - !Ref CfnUrlPrefix
676-
- scripts/create-console-listener.sh
704+
source: !Sub
705+
- >-
706+
https://${QSS3BucketName}.${QSS3Region}.amazonaws.com/${QSS3KeyPrefix}/scripts/create-console-listener.sh
707+
- QSS3Region: !If
708+
- GovCloudCondition
709+
- s3-us-gov-west-1
710+
- s3
677711
owner: root
678712
mode: '000700'
679713
/etc/cfn/set-lb-settings.sh:
680-
source: !Join
681-
- ''
682-
- - !Ref CfnUrlPrefix
683-
- scripts/set-lb-settings.sh
714+
source: !Sub
715+
- >-
716+
https://${QSS3BucketName}.${QSS3Region}.amazonaws.com/${QSS3KeyPrefix}/scripts/set-lb-settings.sh
717+
- QSS3Region: !If
718+
- GovCloudCondition
719+
- s3-us-gov-west-1
720+
- s3
684721
owner: root
685722
mode: '000700'
686723
commands:
@@ -726,10 +763,13 @@ Resources:
726763
fixManagerHostObject:
727764
files:
728765
/etc/cfn/reactivate-manager.sh:
729-
source: !Join
730-
- ''
731-
- - !Ref CfnUrlPrefix
732-
- scripts/reactivate-manager.sh
766+
source: !Sub
767+
- >-
768+
https://${QSS3BucketName}.${QSS3Region}.amazonaws.com/${QSS3KeyPrefix}/scripts/reactivate-manager.sh
769+
- QSS3Region: !If
770+
- GovCloudCondition
771+
- s3-us-gov-west-1
772+
- s3
733773
owner: root
734774
mode: '000700'
735775
commands:
@@ -912,6 +952,9 @@ Conditions:
912952
- !Equals
913953
- !Ref DSProxyUrl
914954
- ''
955+
GovCloudCondition: !Equals
956+
- !Ref 'AWS::Region'
957+
- us-gov-west-1
915958
Outputs:
916959
DSMFQDN:
917960
Value: !GetAtt

0 commit comments

Comments
 (0)