Skip to content

Commit 89ca485

Browse files
trend-nate-huanghowardhcw
trend-nate-huang
authored and
howardhcw
committed
Updated templates to version 5.44
1 parent e37d342 commit 89ca485

22 files changed

+1809
-167
lines changed

‎scripts/end-mp-web-installer.sh

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/bash
2+
sed -i "s|/opt/trend/dsm_app/start.sh &||g" /etc/rc.local
3+
sed -i "s|/opt/trend/dsm_app/start.sh &||g" /etc/rc.d/rc.local
4+
for pid in $(ps -ef | grep "/opt/trend/dsm_app/start.sh" | awk '{print $2}'); do kill -9 $pid; done
5+
kill -9 $(netstat -plnt | grep :8080 | grep python | grep -oP '(\d*)\/python' | grep -oP '(\d*)')
6+
exit 0

‎templates/common/db/ds-db-abstract.template

+10-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
---
22
AWSTemplateFormatVersion: 2010-09-09
3-
Description: 'v5.42: This template is an abstraction layer for choosing PostgreSQL,
3+
Description: 'v5.44: This template is an abstraction layer for choosing PostgreSQL,
44
Oracle or MSSQL when deploying Deep Security Manager. (qs-1ngr590i4)'
5+
Metadata:
6+
cfn-lint:
7+
config:
8+
ignore_checks: [W2001,W8001]
59
Parameters:
610
AWSIKeyPairName:
711
Description: Existing key pair to use for connecting to database if using Postgres on Docker
812
Instance
913
Type: AWS::EC2::KeyPair::KeyName
10-
MinLength: '1'
11-
MaxLength: '255'
1214
ConstraintDescription: Select an existing EC2 Key Pair.
1315
DBIRDSInstanceSize:
1416
Default: db.m5.large
@@ -154,7 +156,7 @@ Resources:
154156
- 'https://${S3Bucket}.s3.${S3Region}.${AWS::URLSuffix}/${QSS3KeyPrefix}templates/common/db/ds-db-oracle-rds.template'
155157
- S3Region: !If [UsingDefaultBucket, !Ref 'AWS::Region', !Ref QSS3BucketRegion]
156158
S3Bucket: !If [UsingDefaultBucket, !Sub '${QSS3BucketName}-${AWS::Region}', !Ref QSS3BucketName]
157-
TimeoutInMinutes: '45'
159+
TimeoutInMinutes: 65
158160
Parameters:
159161
DBIRDSInstanceSize: !Ref DBIRDSInstanceSize
160162
DBIStorageAllocation: !Ref DBIStorageAllocation
@@ -174,7 +176,7 @@ Resources:
174176
- 'https://${S3Bucket}.s3.${S3Region}.${AWS::URLSuffix}/${QSS3KeyPrefix}templates/common/db/ds-db-mssql-rds.template'
175177
- S3Region: !If [UsingDefaultBucket, !Ref 'AWS::Region', !Ref QSS3BucketRegion]
176178
S3Bucket: !If [UsingDefaultBucket, !Sub '${QSS3BucketName}-${AWS::Region}', !Ref QSS3BucketName]
177-
TimeoutInMinutes: '65'
179+
TimeoutInMinutes: 65
178180
Parameters:
179181
DBIRDSInstanceSize: !Ref DBIRDSInstanceSize
180182
DBIStorageAllocation: !Ref DBIStorageAllocation
@@ -194,7 +196,7 @@ Resources:
194196
- 'https://${S3Bucket}.s3.${S3Region}.${AWS::URLSuffix}/${QSS3KeyPrefix}templates/common/db/ds-db-postgresql-rds.template'
195197
- S3Region: !If [UsingDefaultBucket, !Ref 'AWS::Region', !Ref QSS3BucketRegion]
196198
S3Bucket: !If [UsingDefaultBucket, !Sub '${QSS3BucketName}-${AWS::Region}', !Ref QSS3BucketName]
197-
TimeoutInMinutes: '45'
199+
TimeoutInMinutes: 65
198200
Parameters:
199201
DBIRDSInstanceSize: !Ref DBIRDSInstanceSize
200202
DBIStorageAllocation: !Ref DBIStorageAllocation
@@ -214,7 +216,7 @@ Resources:
214216
- 'https://${S3Bucket}.s3.${S3Region}.${AWS::URLSuffix}/${QSS3KeyPrefix}templates/common/db/ds-db-postgresql-rds-aurora.template'
215217
- S3Region: !If [UsingDefaultBucket, !Ref 'AWS::Region', !Ref QSS3BucketRegion]
216218
S3Bucket: !If [UsingDefaultBucket, !Sub '${QSS3BucketName}-${AWS::Region}', !Ref QSS3BucketName]
217-
TimeoutInMinutes: '45'
219+
TimeoutInMinutes: 65
218220
Parameters:
219221
DBIRDSInstanceSize: !Ref DBIRDSInstanceSize
220222
DBPBackupDays: !Ref DBPBackupDays
@@ -239,7 +241,7 @@ Resources:
239241
- 'https://${S3Bucket}.s3.${S3Region}.${AWS::URLSuffix}/${QSS3KeyPrefix}templates/common/db/ds-db-postgresql-docker.template'
240242
- S3Region: !If [UsingDefaultBucket, !Ref 'AWS::Region', !Ref QSS3BucketRegion]
241243
S3Bucket: !If [UsingDefaultBucket, !Sub '${QSS3BucketName}-${AWS::Region}', !Ref QSS3BucketName]
242-
TimeoutInMinutes: '15'
244+
TimeoutInMinutes: 15
243245
Parameters:
244246
AWSIKeyPairName: !Ref AWSIKeyPairName
245247
DBICAdminName: !Ref DBICAdminName

‎templates/common/db/ds-db-mssql-rds.template

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
---
22
AWSTemplateFormatVersion: 2010-09-09
3-
Description: 'v5.42: This template deploys an MSSQL RDS Instance for Deep Security
3+
Description: 'v5.44: This template deploys an MSSQL RDS Instance for Deep Security
44
Manager. (qs-1ngr590ij)'
5+
Metadata:
6+
cfn-lint:
7+
config:
8+
ignore_checks: [W2001,W8001,W2030]
59
Parameters:
610
DBIRDSInstanceSize:
711
Default: db.m5.large

‎templates/common/db/ds-db-oracle-rds.template

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
---
22
AWSTemplateFormatVersion: 2010-09-09
3-
Description: 'v5.42: This template deploys an Oracle RDS instance for Deep Security
3+
Description: 'v5.44: This template deploys an Oracle RDS instance for Deep Security
44
Manager. (qs-1ngr590i9)'
5+
Metadata:
6+
cfn-lint:
7+
config:
8+
ignore_checks: [W8001]
59
Parameters:
610
DBIRDSInstanceSize:
711
Default: db.m5.large

‎templates/common/db/ds-db-postgresql-docker.template

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
---
22
AWSTemplateFormatVersion: 2010-09-09
3-
Description: 'v5.42: ONLY FOR DEMO, NOT A SUPPORTED DEPLOYMENT OPTION.
3+
Description: 'v5.44: ONLY FOR DEMO, NOT A SUPPORTED DEPLOYMENT OPTION.
44
This template deploys PostgreSQL on Docker for Deep Security Manager.'
5+
Metadata:
6+
cfn-lint:
7+
config:
8+
ignore_checks: [W2001,W8001,W1011]
59
Parameters:
610
AWSIKeyPairName:
711
Description: Existing key pair to use for connecting to database instance
812
Instance
913
Type: AWS::EC2::KeyPair::KeyName
10-
MinLength: '1'
11-
MaxLength: '255'
1214
ConstraintDescription: Select an existing EC2 Key Pair.
1315
DBIRDSInstanceSize:
1416
Default: db.m5.large

‎templates/common/db/ds-db-postgresql-rds-aurora.template

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
AWSTemplateFormatVersion: 2010-09-09
3-
Description: 'v5.42: This template deploys an Aurora PostgreSQL RDS instance for Deep Security
3+
Description: 'v5.44: This template deploys an Aurora PostgreSQL RDS instance for Deep Security
44
Manager. (qs-1ngr590ie)'
55
Parameters:
66
DBIRDSInstanceSize:
@@ -60,6 +60,12 @@ Parameters:
6060
Resources:
6161
DSAuroraCluster:
6262
Type: AWS::RDS::DBCluster
63+
Metadata:
64+
cfn-lint:
65+
config:
66+
ignore_checks: [ERDSStorageEncryptionEnabled]
67+
ignore_reasons:
68+
ERDSStorageEncryptionEnabled: 'This setting of StorageEncrypted is true in the template.'
6369
Properties:
6470
BackupRetentionPeriod: !Ref DBPBackupDays
6571
DatabaseName: !Ref DBPName

‎templates/common/db/ds-db-postgresql-rds.template

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
---
22
AWSTemplateFormatVersion: 2010-09-09
3-
Description: 'v5.42: This template deploys a PostgreSQL RDS instance for Deep Security
3+
Description: 'v5.44: This template deploys a PostgreSQL RDS instance for Deep Security
44
Manager. (qs-1ngr590ie)'
5+
Metadata:
6+
cfn-lint:
7+
config:
8+
ignore_checks: [W8001,W2030]
59
Parameters:
610
DBIRDSInstanceSize:
711
Default: db.m5.large
@@ -104,7 +108,7 @@ Resources:
104108
AllocatedStorage: !Ref DBIStorageAllocation
105109
DBInstanceClass: !Ref DBIRDSInstanceSize
106110
Engine: postgres
107-
EngineVersion: 11.9
111+
EngineVersion: '11.9'
108112
MasterUsername: !Ref DBICAdminName
109113
MasterUserPassword: !Ref DBICAdminPassword
110114
VPCSecurityGroups:

‎templates/common/dsm-elb.template

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
---
22
AWSTemplateFormatVersion: 2010-09-09
3-
Description: 'v5.42: Deploys Elastic Load Balancers and Security Groups for Deep Security
3+
Description: 'v5.44: Deploys Elastic Load Balancers and Security Groups for Deep Security
44
(qs-1ngr590je). Manager.'
5+
Metadata:
6+
cfn-lint:
7+
config:
8+
ignore_checks: [W3005,W8001]
59
Parameters:
610
AWSIVPC:
711
Description: Existing VPC to deploy Deep Security Manager
812
Type: AWS::EC2::VPC::Id
9-
MinLength: '1'
10-
MaxLength: '255'
1113
AllowedPattern: '[-_a-zA-Z0-9]*'
1214
DSIPHeartbeatPort:
1315
Description: The heartbeat port used by Deep Security Agents and appliances to

‎templates/common/security-groups/ds-elb-sg.template

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
---
22
AWSTemplateFormatVersion: 2010-09-09
3-
Description: 'v5.42: This template creates security groups for the ELB for Deep Security
3+
Description: 'v5.44: This template creates security groups for the ELB for Deep Security
44
Manager. (qs-1ngr590io)'
55
Parameters:
66
AWSIVPC:
77
Description: Existing VPC to deploy Deep Security Manager
88
Type: AWS::EC2::VPC::Id
9-
MinLength: '1'
10-
MaxLength: '255'
119
AllowedPattern: '[-_a-zA-Z0-9]*'
1210
DSIPGUIPort:
1311
Description: The Deep Security Manager application and GUI port.
@@ -40,8 +38,8 @@ Resources:
4038
ToPort: !Ref DSIPGUIPort
4139
CidrIp: 0.0.0.0/0
4240
- IpProtocol: tcp
43-
FromPort: '4122'
44-
ToPort: '4122'
41+
FromPort: 4122
42+
ToPort: 4122
4543
CidrIp: 0.0.0.0/0
4644
SecurityGroupEgress:
4745
- IpProtocol: '-1'

‎templates/common/security-groups/dsm-security-group.template

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
---
22
AWSTemplateFormatVersion: 2010-09-09
3-
Description: 'v5.42: This template creates the security group to allow inbound communication
3+
Description: 'v5.44: This template creates the security group to allow inbound communication
44
to Deep Security Manager. (qs-1ngr590iu)'
5+
Metadata:
6+
cfn-lint:
7+
config:
8+
ignore_checks: [W2001]
59
Parameters:
610
AWSIVPC:
711
Description: Existing VPC to deploy Deep Security Manager
812
Type: AWS::EC2::VPC::Id
9-
MinLength: '1'
10-
MaxLength: '255'
1113
AllowedPattern: '[-_a-zA-Z0-9]*'
1214
DSIPGUIPort:
1315
Description: The Deep Security Manager application and GUI port.

‎templates/common/security-groups/dsm-sg-ingress-rules.template

+19-19
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
AWSTemplateFormatVersion: 2010-09-09
3-
Description: 'v5.42: This template creates the ingress rules for Deep Security Managers.
3+
Description: 'v5.44: This template creates the ingress rules for Deep Security Managers.
44
(qs-1ngr590j4)'
55
Parameters:
66
DSMSG:
@@ -46,16 +46,16 @@ Resources:
4646
Properties:
4747
GroupId: !Ref DSMSG
4848
IpProtocol: tcp
49-
FromPort: '4122'
50-
ToPort: '4122'
49+
FromPort: 4122
50+
ToPort: 4122
5151
SourceSecurityGroupId: !Ref ELBSourceSG
5252
DSMAgentIngress:
5353
Type: AWS::EC2::SecurityGroupIngress
5454
Properties:
5555
GroupId: !Ref DSMSG
5656
IpProtocol: tcp
57-
FromPort: '4118'
58-
ToPort: '4118'
57+
FromPort: 4118
58+
ToPort: 4118
5959
SourceSecurityGroupId: !Ref DSMSG
6060
DSMConsoleIngressSelf:
6161
Type: AWS::EC2::SecurityGroupIngress
@@ -78,8 +78,8 @@ Resources:
7878
Properties:
7979
GroupId: !Ref DSMSG
8080
IpProtocol: tcp
81-
FromPort: '4122'
82-
ToPort: '4122'
81+
FromPort: 4122
82+
ToPort: 4122
8383
SourceSecurityGroupId: !Ref DSMSG
8484
DSMConsoleIngress1921918:
8585
Type: AWS::EC2::SecurityGroupIngress
@@ -102,8 +102,8 @@ Resources:
102102
Properties:
103103
GroupId: !Ref DSMSG
104104
IpProtocol: tcp
105-
FromPort: '4122'
106-
ToPort: '4122'
105+
FromPort: 4122
106+
ToPort: 4122
107107
CidrIp: 192.168.0.0/16
108108
DSMConsoleIngress101918:
109109
Type: AWS::EC2::SecurityGroupIngress
@@ -126,8 +126,8 @@ Resources:
126126
Properties:
127127
GroupId: !Ref DSMSG
128128
IpProtocol: tcp
129-
FromPort: '4122'
130-
ToPort: '4122'
129+
FromPort: 4122
130+
ToPort: 4122
131131
CidrIp: 10.0.0.0/8
132132
DSMConsoleIngress1721918:
133133
Type: AWS::EC2::SecurityGroupIngress
@@ -150,31 +150,31 @@ Resources:
150150
Properties:
151151
GroupId: !Ref DSMSG
152152
IpProtocol: tcp
153-
FromPort: '4122'
154-
ToPort: '4122'
153+
FromPort: 4122
154+
ToPort: 4122
155155
CidrIp: 172.16.0.0/12
156156
DSMDNS1721918:
157157
Type: AWS::EC2::SecurityGroupIngress
158158
Properties:
159159
GroupId: !Ref DSMSG
160160
IpProtocol: udp
161-
FromPort: '53'
162-
ToPort: '53'
161+
FromPort: 53
162+
ToPort: 53
163163
CidrIp: 172.16.0.0/12
164164
DSMDNS101918:
165165
Type: AWS::EC2::SecurityGroupIngress
166166
Properties:
167167
GroupId: !Ref DSMSG
168168
IpProtocol: udp
169-
FromPort: '53'
170-
ToPort: '53'
169+
FromPort: 53
170+
ToPort: 53
171171
CidrIp: 10.0.0.0/8
172172
DSMDNS1921918:
173173
Type: AWS::EC2::SecurityGroupIngress
174174
Properties:
175175
GroupId: !Ref DSMSG
176176
IpProtocol: udp
177-
FromPort: '53'
178-
ToPort: '53'
177+
FromPort: 53
178+
ToPort: 53
179179
CidrIp: 192.168.0.0/16
180180
...

‎templates/common/security-groups/rds-security-group.template

+11-9
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
---
22
AWSTemplateFormatVersion: 2010-09-09
3-
Description: 'v5.42: This template creates the security group to allow communication
3+
Description: 'v5.44: This template creates the security group to allow communication
44
from Deep Security Managers to their RDS Instance. (qs-1ngr590j9)'
5+
Metadata:
6+
cfn-lint:
7+
config:
8+
ignore_checks: [W8001]
59
Parameters:
610
AWSIVPC:
711
Description: Existing VPC to deploy Deep Security Manager
812
Type: AWS::EC2::VPC::Id
9-
MinLength: '1'
10-
MaxLength: '255'
1113
AllowedPattern: '[-_a-zA-Z0-9]*'
1214
DBPEngine:
1315
Description: Choose PostgreSQL, MSSQL, Oracle or AuroraPostgreSQL for DSM database Engine
@@ -32,19 +34,19 @@ Resources:
3234
FromPort:
3335
!If
3436
- DBTypeIsOracle
35-
- '1521'
37+
- 1521
3638
- !If
3739
- DBTypeIsPostgreSQL
38-
- '5432'
39-
- '1433'
40+
- 5432
41+
- 1433
4042
ToPort:
4143
!If
4244
- DBTypeIsOracle
43-
- '1521'
45+
- 1521
4446
- !If
4547
- DBTypeIsPostgreSQL
46-
- '5432'
47-
- '1433'
48+
- 5432
49+
- 1433
4850
SourceSecurityGroupId: !Ref DSMSG
4951
SecurityGroupEgress:
5052
- IpProtocol: '-1'

0 commit comments

Comments
 (0)