Skip to content

Commit 29b7ed6

Browse files
424D57424D57
committed
Add support for MMS Marketplace AMI; Start integration of QS front templates to Master
1 parent c17227a commit 29b7ed6

14 files changed

+1010
-42
lines changed

‎DeepSecurity/Common/DB/DSDBAbstract.template

+6-2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
"Description" : "Trend Micro Deep Security Database instance class",
88
"Type" : "String",
99
"AllowedValues" : [
10+
"db.m4.medium",
11+
"db.m4.large",
12+
"db.m4.xlarge",
13+
"db.m4.2xlarge",
1014
"db.m3.medium",
1115
"db.m3.large",
1216
"db.m3.xlarge",
@@ -118,7 +122,7 @@
118122
"Type" : "AWS::CloudFormation::Stack",
119123
"Condition" : "DBTypeIsOracle",
120124
"Properties" : {
121-
"TemplateURL" : "https://cf-deepsecurity.s3.amazonaws.com/96/v0.5/DB/DSDBOracleRDS.template",
125+
"TemplateURL" : "https://cf-deepsecurity.s3.amazonaws.com/96/v0.6/DB/DSDBOracleRDS.template",
122126
"TimeoutInMinutes" : "10",
123127
"Parameters" : {
124128
"DBIRDSInstanceSize" : {
@@ -152,7 +156,7 @@
152156
"Type" : "AWS::CloudFormation::Stack",
153157
"Condition" : "DBTypeIsSQL",
154158
"Properties" : {
155-
"TemplateURL" : "https://cf-deepsecurity.s3.amazonaws.com/96/v0.5/DB/DSDBSQLRDS.template",
159+
"TemplateURL" : "https://cf-deepsecurity.s3.amazonaws.com/96/v0.6/DB/DSDBSQLRDS.template",
156160
"TimeoutInMinutes" : "10",
157161
"Parameters" : {
158162
"DBIRDSInstanceSize" : {

‎DeepSecurity/Common/DB/DSDBOracleRDS.template

+4
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
"Description" : "Trend Micro Deep Security Database instance class",
88
"Type" : "String",
99
"AllowedValues" : [
10+
"db.m4.medium",
11+
"db.m4.large",
12+
"db.m4.xlarge",
13+
"db.m4.2xlarge",
1014
"db.m3.medium",
1115
"db.m3.large",
1216
"db.m3.xlarge",

‎DeepSecurity/Common/DB/DSDBSQLRDS.template

+4
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
"Description" : "Trend Micro Deep Security Database instance class",
88
"Type" : "String",
99
"AllowedValues" : [
10+
"db.m4.medium",
11+
"db.m4.large",
12+
"db.m4.xlarge",
13+
"db.m4.2xlarge",
1014
"db.m3.medium",
1115
"db.m3.large",
1216
"db.m3.xlarge",

‎DeepSecurity/Common/DSM96ELB.template

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"ELBSG" : {
4848
"Type" : "AWS::CloudFormation::Stack",
4949
"Properties" : {
50-
"TemplateURL" : "https://cf-deepsecurity.s3.amazonaws.com/96/v0.5/SecurityGroups/DSELBSG.template",
50+
"TemplateURL" : "https://cf-deepsecurity.s3.amazonaws.com/96/v0.6/SecurityGroups/DSELBSG.template",
5151
"Parameters" : {
5252
"AWSIVPC" : {
5353
"Ref" : "AWSIVPC"

‎DeepSecurity/Common/helpers/cfn-rh-sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ yum -y install gcc-c++
77
yum -y install python-devel
88
yum -y install freetds-devel
99
pip install pymssql
10-
wget https://cf-deepsecurity.s3.amazonaws.com/96/v0.5/Scripts/create-DSM-SqlDB.py
10+
wget https://cf-deepsecurity.s3.amazonaws.com/96/v0.6/Scripts/create-DSM-SqlDB.py
1111
chmod 755 create-DSM-SqlDB.py
1212

‎DeepSecurity/DeepSecurity.cfproj

+13
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,18 @@
4848
<Compile Include="Marketplace\MasterMP96.template">
4949
<SubType>Code</SubType>
5050
</Compile>
51+
<Compile Include="Quickstart\Infrastructure.template">
52+
<SubType>Code</SubType>
53+
</Compile>
54+
<Compile Include="Quickstart\TMQuickStartBYOL.template">
55+
<SubType>Code</SubType>
56+
</Compile>
57+
<Compile Include="Quickstart\TMQuickStartPocMMS.template">
58+
<SubType>Code</SubType>
59+
</Compile>
60+
<Compile Include="Quickstart\TMQuickStartPPU.template">
61+
<SubType>Code</SubType>
62+
</Compile>
5163
<Compile Include="RHEL\DSM96RH.template">
5264
<SubType>Code</SubType>
5365
</Compile>
@@ -93,6 +105,7 @@
93105
<Folder Include="Common\Security Groups\" />
94106
<Folder Include="Common" />
95107
<Folder Include="Marketplace" />
108+
<Folder Include="Quickstart" />
96109
<Folder Include="RHEL" />
97110
</ItemGroup>
98111
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

‎DeepSecurity/Marketplace/DSM96MP.template

+44-11
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,8 @@
159159
"Description" : "Choose License Model. If choosing BYOL you may enter the license below",
160160
"Type" : "String",
161161
"AllowedValues" : [
162-
"BYOL",
162+
"MMS",
163+
"BYOL",
163164
"25",
164165
"50",
165166
"100",
@@ -199,6 +200,7 @@
199200
"Mappings" : {
200201
"DSMAMI" : {
201202
"us-east-1" : {
203+
"MMS" : "ami-bf2d29d5",
202204
"BYOL" : "ami-371e3c5d",
203205
"25" : "ami-d61634bc",
204206
"50" : "ami-d61634bc",
@@ -213,6 +215,7 @@
213215
"200" : "ami-9dbfc8fd"
214216
},
215217
"us-west-2" : {
218+
"MMS" : "ami-20bf5140",
216219
"BYOL" : "ami-09ec0b69",
217220
"25" : "ami-5fea0d3f",
218221
"50" : "ami-5fea0d3f",
@@ -271,69 +274,79 @@
271274
},
272275
"DSMSIZE" : {
273276
"us-east-1" : {
277+
"MMS" : "c3.xlarge",
274278
"BYOL" : "c3.xlarge",
275279
"25" : "m4.large",
276280
"50" : "m4.xlarge",
277281
"100": "m4.2xlarge",
278282
"200": "c4.4xlarge"
279283
},
280284
"us-west-1" : {
285+
"MMS" : "c3.xlarge",
281286
"BYOL" : "c3.xlarge",
282287
"25" : "m4.large",
283288
"50" : "m4.xlarge",
284289
"100": "m4.2xlarge",
285290
"200": "c4.4xlarge"
286291
},
287292
"us-west-2" : {
293+
"MMS" : "c3.xlarge",
288294
"BYOL" : "c3.xlarge",
289295
"25" : "m4.large",
290296
"50" : "m4.xlarge",
291297
"100": "m4.2xlarge",
292298
"200": "c4.4xlarge"
293299
},
294300
"eu-west-1" : {
301+
"MMS" : "c3.xlarge",
295302
"BYOL" : "c3.xlarge",
296303
"25" : "m4.large",
297304
"50" : "m4.xlarge",
298305
"100": "m4.2xlarge",
299306
"200": "c4.4xlarge"
300307
},
301308
"eu-central-1" : {
309+
"MMS" : "c3.xlarge",
302310
"BYOL" : "c3.xlarge",
303311
"25" : "m4.large",
304312
"50" : "m4.xlarge",
305313
"100": "m4.2xlarge",
306314
"200": "c4.4xlarge"
307315
},
308316
"sa-east-1" : {
317+
"MMS" : "c3.xlarge",
309318
"BYOL" : "c3.xlarge",
310319
"25" : "m3.large",
311320
"50" : "m3.xlarge",
312321
"100": "m3.2xlarge",
313322
"200": "c3.4xlarge"
314323
},
315324
"ap-northeast-1" : {
325+
"MMS" : "c3.xlarge",
316326
"BYOL" : "c3.xlarge",
317327
"25" : "m4.large",
318328
"50" : "m4.xlarge",
319329
"100": "m4.2xlarge",
320330
"200": "c4.4xlarge"
321331
},
322332
"ap-southeast-1" : {
333+
"MMS" : "c3.xlarge",
323334
"BYOL" : "c3.xlarge",
324335
"25" : "m4.large",
325336
"50" : "m4.xlarge",
326337
"100": "m4.2xlarge",
327338
"200": "c4.4xlarge"
328339
},
329340
"ap-southeast-2" : {
341+
"MMS" : "c3.xlarge",
330342
"BYOL" : "c3.xlarge",
331343
"25" : "m4.large",
332344
"50" : "m4.xlarge",
333345
"100": "m4.2xlarge",
334346
"200": "c4.4xlarge"
335347
},
336348
"ap-northeast-2" : {
349+
"MMS" : "c3.xlarge",
337350
"BYOL" : "m4.xlarge",
338351
"25" : "m4.large",
339352
"50" : "m4.xlarge",
@@ -844,25 +857,31 @@
844857
"ignoreErrors" : "false"
845858
},
846859
"1-install-DSM" : {
847-
"command" : "cd /opt/trend/packages/dsm/default/; sh /opt/trend/packages/dsm/default/Manager-AWS-9.6.11662.x64.sh -q -console -varfile /etc/cfn/dsmConfiguration.properties >> /tmp/dsmInstallLog",
860+
"command" : {
861+
"Fn::If" : [
862+
"UseMMS",
863+
"cd /opt/trend/packages/dsm/default/; sh /opt/trend/packages/dsm/default/Manager-AWS-9.6.11937.x64.sh -q -console -varfile /etc/cfn/dsmConfiguration.properties >> /tmp/dsmInstallLog",
864+
"cd /opt/trend/packages/dsm/default/; sh /opt/trend/packages/dsm/default/Manager-AWS-9.6.11662.x64.sh -q -console -varfile /etc/cfn/dsmConfiguration.properties >> /tmp/dsmInstallLog"
865+
]
866+
},
848867
"ignoreErrors" : "false"
849868
}
850869
}
851870
},
852871
"addCloudAccount" : {
853872
"files" : {
854873
"/etc/cfn/set-aiaSettings" : {
855-
"source" : "https://cf-deepsecurity.s3.amazonaws.com/96/v0.5/Scripts/set-aiaSettings",
874+
"source" : "https://cf-deepsecurity.s3.amazonaws.com/96/v0.6/Scripts/set-aiaSettings",
856875
"owner" : "root",
857876
"mode" : "000700"
858877
},
859878
"/etc/cfn/createCloudAccount" : {
860-
"source" : "https://cf-deepsecurity.s3.amazonaws.com/96/v0.5/Scripts/createCloudAccount",
879+
"source" : "https://cf-deepsecurity.s3.amazonaws.com/96/v0.6/Scripts/createCloudAccount",
861880
"owner" : "root",
862881
"mode" : "000700"
863882
},
864883
"/etc/cfn/wait-for-relay-and-stop-manager" : {
865-
"source" : "https://cf-deepsecurity.s3.amazonaws.com/96/v0.5/Scripts/wait-for-relay-and-stop-manager",
884+
"source" : "https://cf-deepsecurity.s3.amazonaws.com/96/v0.6/Scripts/wait-for-relay-and-stop-manager",
866885
"owner" : "root",
867886
"mode" : "000700"
868887
}
@@ -954,7 +973,7 @@
954973
"sqlSetup" : {
955974
"commands" : {
956975
"1-get-create-script" : {
957-
"command" : "cd /etc/cfn/rhel-scripts; wget https://s3.amazonaws.com/cf-deepsecurity/96/v0.5/Scripts/create-DSM-SqlDB.py; chmod 755 create-DSM-SqlDB.py",
976+
"command" : "cd /etc/cfn/rhel-scripts; wget https://s3.amazonaws.com/cf-deepsecurity/96/v0.6/Scripts/create-DSM-SqlDB.py; chmod 755 create-DSM-SqlDB.py",
958977
"ignoreErrors" : "false"
959978
},
960979
"2-create-db" : {
@@ -1028,12 +1047,12 @@
10281047
"fixManagerLoadBalancerSettings" : {
10291048
"files" : {
10301049
"/etc/cfn/create-console-listener" : {
1031-
"source" : "https://cf-deepsecurity.s3.amazonaws.com/96/v0.5/Scripts/create-console-listener",
1050+
"source" : "https://cf-deepsecurity.s3.amazonaws.com/96/v0.6/Scripts/create-console-listener",
10321051
"owner" : "root",
10331052
"mode" : "000700"
10341053
},
10351054
"/etc/cfn/set-lbSettings" : {
1036-
"source" : "https://cf-deepsecurity.s3.amazonaws.com/96/v0.5/Scripts/set-lbSettings",
1055+
"source" : "https://cf-deepsecurity.s3.amazonaws.com/96/v0.6/Scripts/set-lbSettings",
10371056
"owner" : "root",
10381057
"mode" : "000700"
10391058
}
@@ -1156,7 +1175,7 @@
11561175
"fixManagerHostObject" : {
11571176
"files" : {
11581177
"/etc/cfn/reactivate-manager" : {
1159-
"source" : "https://cf-deepsecurity.s3.amazonaws.com/96/v0.5/Scripts/reactivate-manager",
1178+
"source" : "https://cf-deepsecurity.s3.amazonaws.com/96/v0.6/Scripts/reactivate-manager",
11601179
"owner" : "root",
11611180
"mode" : "000700"
11621181
}
@@ -1207,7 +1226,7 @@
12071226
},
12081227
"InstanceType" : {
12091228
"Fn::If" : [
1210-
"UseBYOL",
1229+
"PPUNotSelected",
12111230
{
12121231
"Ref" : "DSIPInstanceType"
12131232
},
@@ -1374,6 +1393,20 @@
13741393
},
13751394
"BYOL"
13761395
]
1396+
},
1397+
"UseMMS" : {
1398+
"Fn::Equals" : [
1399+
{
1400+
"Ref" : "DSIPLicense"
1401+
},
1402+
"MMS"
1403+
]
1404+
},
1405+
"PPUNotSelected" : {
1406+
"Fn::Or" : [
1407+
{ "Condition" : "UseMMS" },
1408+
{ "Condition" : "UseBYOL" }
1409+
]
13771410
},
13781411
"AddToELB" : {
13791412
"Fn::Not" : [
@@ -1445,7 +1478,7 @@
14451478
"Condition" : "KeyProvided"
14461479
},
14471480
{
1448-
"Condition" : "UseBYOL"
1481+
"Condition" : "PPUNotSelected"
14491482
}
14501483
]
14511484
}

0 commit comments

Comments
 (0)