Merge pull request #4 from trend-scottb/develop

santiagocardenas · web-flow · commit 9bc98bc0f299 · 2016-07-22T13:00:13.000-07:00
Updated to v3.7 to support more per host regions and use the latest amis
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,17 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Custom for Visual Studio
+*.cs     diff=csharp
+
+# Standard to msysgit
+*.doc	 diff=astextplain
+*.DOC	 diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot  diff=astextplain
+*.DOT  diff=astextplain
+*.pdf  diff=astextplain
+*.PDF	 diff=astextplain
+*.rtf	 diff=astextplain
+*.RTF	 diff=astextplain
diff --git a/templates/Common/DB/DSDBAbstract.template b/templates/Common/DB/DSDBAbstract.template
@@ -118,7 +118,7 @@
         },
 		"CfnUrlPrefix" : {
 			"Type" : "String",
-			"Default" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.4/"
+			"Default" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.7/"
 		}
     },
     "Resources"                : {
diff --git a/templates/Common/DSM96ELB.template b/templates/Common/DSM96ELB.template
@@ -35,7 +35,7 @@
         },
 		"CfnUrlPrefix" : {
 			"Type" : "String",
-			"Default" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.4/"
+			"Default" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.7/"
 		}
     },
     "Resources"                : {
diff --git a/templates/Common/Scripts/cfn-rh-helper b/templates/Common/Scripts/cfn-rh-helper
@@ -13,4 +13,4 @@ cp /etc/cfn/rhel-scripts/aws-cfn-bootstrap-latest/aws-cfn-bootstrap-1.4/init/red
 chmod 755 /etc/init.d/cfn-hup
 chmod 775 /etc/cfn/rhel-scripts/aws-cfn-bootstrap-latest/aws-cfn-bootstrap-1.4/init/redhat/cfn-hup
 mkdir -p /opt/aws/bin/
-ln -s /usr/bin/cfn-hup /opt/aws/bin/cfn-hup
+ln -s /usr/bin/cfn-hup /opt/aws/bin/cfn-hup
diff --git a/templates/Common/Scripts/cfn-rh-sql b/templates/Common/Scripts/cfn-rh-sql
@@ -7,5 +7,6 @@ yum -y install gcc-c++
 yum -y install python-devel
 yum -y install freetds-devel
 pip install  pymssql
-curl -O https://s3.amazonaws.com/trend-micro-quick-start/v3.4/Common/Scripts/create-DSM-SqlDB.py
+curl -O https://s3.amazonaws.com/trend-micro-quick-start/v3.7/Common/Scripts/create-DSM-SqlDB.py
 chmod 755 create-DSM-SqlDB.py
+
diff --git a/templates/Common/Scripts/create-DSM-SqlDB.py b/templates/Common/Scripts/create-DSM-SqlDB.py
@@ -17,3 +17,7 @@
 cursor.execute("CREATE DATABASE %s" % args.dbname)
 conn.close()
 #done
+
+
+
+
diff --git a/templates/Common/Scripts/create-console-listener b/templates/Common/Scripts/create-console-listener
@@ -33,4 +33,4 @@ done
 echo 'load balancer listener created'
 
 aws elb create-load-balancer-policy --load-balancer-name $1 --policy-name DSMConsoleStickySessions --policy-type-name LBCookieStickinessPolicyType --region $6 --policy-attributes AttributeName=CookieExpirationPeriod,AttributeValue=600
-aws elb set-load-balancer-policies-of-listener --load-balancer-name $1 --load-balancer-port 443 --policy-names DSMConsoleStickySessions --region $6
+aws elb set-load-balancer-policies-of-listener --load-balancer-name $1 --load-balancer-port 443 --policy-names DSMConsoleStickySessions --region $6
diff --git a/templates/Common/Scripts/create-console-listener-policy b/templates/Common/Scripts/create-console-listener-policy
@@ -3,4 +3,3 @@
 aws elb create-load-balancer-listeners --load-balancer-name $1 --listeners Protocol=HTTPS,LoadBalancerPort=$3,InstanceProtocol=HTTPS,InstancePort=$3,SSLCertificateId=$certid
 aws elb create-load-balancer-policy --load-balancer-name $1 --policy-name DSMConsoleStickySessions --policy-type-name LBCookieStickinessPolicyType --policy-attributes AttributeName=CookieExpirationPeriod,AttributeValue=600
 aws elb set-load-balancer-policies-of-listener --load-balancer-name $1 --load-balancer-port 443 --policy-names DSMConsoleStickySessions
-
diff --git a/templates/Common/Scripts/createCloudAccount b/templates/Common/Scripts/createCloudAccount
@@ -55,3 +55,5 @@ unset tempDSSID
 unset username
 unset password
 
+
+
diff --git a/templates/Common/Scripts/createCloudAccountGc b/templates/Common/Scripts/createCloudAccountGc
@@ -56,3 +56,4 @@ unset secretkey
 unset tempDSSID
 unset username
 unset password
+
diff --git a/templates/Common/Scripts/dsm_s.service b/templates/Common/Scripts/dsm_s.service
@@ -11,4 +11,3 @@ TimeoutStopSec=0
 
 [Install]
 WantedBy=default.target
-
diff --git a/templates/Common/Scripts/kill-mp-web-installer b/templates/Common/Scripts/kill-mp-web-installer
@@ -3,4 +3,4 @@ sed -i "s|/opt/trend/dsm_app/start.sh &||g" /etc/rc.local
 sed -i "s|/opt/trend/dsm_app/start.sh &||g" /etc/rc.d/rc.local
 for pid in $(ps -ef | grep "/opt/trend/dsm_app/start.sh" | awk '{print $2}'); do kill -9 $pid; done
 kill -9 $(netstat -plnt | grep :8080 | grep python | grep -oP '(\d*)\/python' | grep -oP '(\d*)')
-exit 0
+exit 0
diff --git a/templates/Common/Scripts/reactivate-manager b/templates/Common/Scripts/reactivate-manager
@@ -131,4 +131,3 @@ esac
 ## log out
 curl -k -X DELETE https://localhost:$3/rest/authentication/logout?sID="$SID"
 exit 0
-
diff --git a/templates/Common/Scripts/set-aiaSettings b/templates/Common/Scripts/set-aiaSettings
@@ -24,11 +24,6 @@ curl -k -v -H "Content-Type: text/xml;charset=UTF-8" -H 'SOAPAction: "systemSett
 '<urn:settingUnit>NONE</urn:settingUnit>'\
 '<urn:settingValue>2</urn:settingValue>'\
 '</urn:editableSettings>'\
-'<urn:editableSettings>'\
-'<urn:settingKey>CONFIGURATION_AGENTCOMMUNICATIONS</urn:settingKey>'\
-'<urn:settingUnit>NONE</urn:settingUnit>'\
-'<urn:settingValue>1</urn:settingValue>'\
-'</urn:editableSettings>'\
 '<urn:sID>'${SID}'</urn:sID>'\
 '</urn:systemSettingSet>'\
 '</soapenv:Body>'\
@@ -82,4 +77,3 @@ echo -e "policyid for Deep Security Virtual Appliance Policy is $policyid\n" >>
 ## log out
 curl -k -X DELETE https://localhost:$3/rest/authentication/logout?sID="$SID"
 exit 
-
diff --git a/templates/Common/Scripts/set-lbSettings b/templates/Common/Scripts/set-lbSettings
@@ -44,3 +44,5 @@ curl -k -v -H "Content-Type: text/xml;charset=UTF-8" -H 'SOAPAction: "systemSett
 '</urn:systemSettingSet>'\
 '</soapenv:Body>'\
 '</soapenv:Envelope'\>
+
+
diff --git a/templates/Common/Scripts/wait-for-relay-and-stop-manager b/templates/Common/Scripts/wait-for-relay-and-stop-manager
@@ -10,4 +10,3 @@ do
 done
 
 service dsm_s stop
-
diff --git a/templates/Marketplace/DSM96MP.template b/templates/Marketplace/DSM96MP.template
@@ -207,83 +207,92 @@
 			},
 		"CfnUrlPrefix" : {
 			"Type" : "String",
-			"Default" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.4/"
+			"Default" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.7/"
         }
     },
     "Mappings"                 : {
         "DSMAMI" : {
 			"us-east-1" : {
-				"PerHost" : "ami-096e7463",
-                "BYOL" : "ami-ed213e87",
-                "25"   : "ami-9d203ff7",
-                "50"   : "ami-9d203ff7",
-                "100"  : "ami-9d203ff7",
-                "200"  : "ami-9d203ff7"
+                "PerHost" : "ami-096e7463",
+                "BYOL" : "ami-5eff3933",
+                "25"   : "ami-a1f036cc",
+                "50"   : "ami-a1f036cc",
+                "100"  : "ami-a1f036cc",
+                "200"  : "ami-a1f036cc"
             },
             "us-west-1" : {
-                "BYOL" : "ami-64b4cb04",
-                "25"   : "ami-a0b4cbc0",
-                "50"   : "ami-a0b4cbc0",
-                "100"  : "ami-a0b4cbc0",
-                "200"  : "ami-a0b4cbc0"
+              "PerHost"  : "ami-820779e2",
+                "BYOL" : "ami-a8bffac8",
+                "25"   : "ami-99b9fcf9",
+                "50"   : "ami-99b9fcf9",
+                "100"  : "ami-99b9fcf9",
+                "200"  : "ami-99b9fcf9"
             },
             "us-west-2" : {
-				"PerHost"  : "ami-27a95947",
-                "BYOL" : "ami-8a3dcbea",
-                "25"   : "ami-853dcbe5",
-                "50"   : "ami-853dcbe5",
-                "100"  : "ami-853dcbe5",
-                "200"  : "ami-853dcbe5"
+                "PerHost"  : "ami-27a95947",
+                "BYOL" : "ami-2e37f24e",
+                "25"   : "ami-8333f6e3",
+                "50"   : "ami-8333f6e3",
+                "100"  : "ami-8333f6e3",
+                "200"  : "ami-8333f6e3"
             },
             "eu-west-1" : {
-				"PerHost" : "ami-0329a670",
-                "BYOL" : "ami-ab119cd8",
-                "25"   : "ami-96139ee5",
-                "50"   : "ami-96139ee5",
-                "100"  : "ami-96139ee5",
-                "200"  : "ami-96139ee5"
+                "PerHost" : "ami-0329a670",
+                "BYOL" : "ami-48a6383b",
+                "25"   : "ami-c3a638b0",
+                "50"   : "ami-c3a638b0",
+                "100"  : "ami-c3a638b0",
+                "200"  : "ami-c3a638b0"
             },
             "eu-central-1" : {
-                "BYOL" : "ami-0548a86a",
-                "25"   : "ami-f946a696",
-                "50"   : "ami-f946a696",
-                "100"  : "ami-f946a696",
-                "200"  : "ami-f946a696"
+                "BYOL" : "ami-c14fa6ae",
+                "25"   : "ami-f44ea79b",
+                "50"   : "ami-f44ea79b",
+                "100"  : "ami-f44ea79b",
+                "200"  : "ami-f44ea79b"
+            },
+            "ap-south-1" : {
+                "BYOL" : "ami-f8a9c397",
+                "25"   : "ami-cca8c2a3",
+                "50"   : "ami-cca8c2a3",
+                "100"  : "ami-cca8c2a3",
+                "200"  : "ami-cca8c2a3"
             },
             "ap-southeast-1" : {
-                "BYOL" : "ami-0ad00469",
-                "25"   : "ami-2bd60248",
-                "50"   : "ami-2bd60248",
-                "100"  : "ami-2bd60248",
-                "200"  : "ami-2bd60248"
+                "BYOL" : "ami-6218cb01",
+                "25"   : "ami-6d18cb0e",
+                "50"   : "ami-6d18cb0e",
+                "100"  : "ami-6d18cb0e",
+                "200"  : "ami-6d18cb0e"
             },
             "ap-northeast-1" : {
-                "BYOL" : "ami-9fa9b5f1",
-                "25"   : "ami-b2aeb2dc",
-                "50"   : "ami-b2aeb2dc",
-                "100"  : "ami-b2aeb2dc",
-                "200"  : "ami-b2aeb2dc"
+                "BYOL" : "ami-d854beb9",
+                "25"   : "ami-d754beb6",
+                "50"   : "ami-d754beb6",
+                "100"  : "ami-d754beb6",
+                "200"  : "ami-d754beb6"
             },
             "ap-southeast-2" : {
-                "BYOL" : "ami-8895b7eb",
-                "25"   : "ami-c595b7a6",
-                "50"   : "ami-c595b7a6",
-                "100"  : "ami-c595b7a6",
-                "200"  : "ami-c595b7a6"
+                "PerHost" : "ami-cbefc2a8",
+                "BYOL" : "ami-8a8ca5e9",
+                "25"   : "ami-898ca5ea",
+                "50"   : "ami-898ca5ea",
+                "100"  : "ami-898ca5ea",
+                "200"  : "ami-898ca5ea"
             },
             "sa-east-1"      : {
-                "BYOL" : "ami-2ca22c40",
-                "25"   : "ami-39a32d55",
-                "50"   : "ami-39a32d55",
-                "100"  : "ami-39a32d55",
-                "200"  : "ami-39a32d55"
+                "BYOL" : "ami-c250daae",
+                "25"   : "ami-6456dc08",
+                "50"   : "ami-6456dc08",
+                "100"  : "ami-6456dc08",
+                "200"  : "ami-6456dc08"
             },
 			"ap-northeast-2"      : {
-                "BYOL" : "ami-590fc737",
-                "25"   : "ami-540ec63a",
-                "50"   : "ami-540ec63a",
-                "100"  : "ami-540ec63a",
-                "200"  : "ami-540ec63a"
+                "BYOL" : "ami-c62ee5a8",
+                "25"   : "ami-3922e957",
+                "50"   : "ami-3922e957",
+                "100"  : "ami-3922e957",
+                "200"  : "ami-3922e957"
             }
         },
         "DSMSIZE" : {
diff --git a/templates/Marketplace/MasterMP96.template b/templates/Marketplace/MasterMP96.template
@@ -292,7 +292,7 @@
 			},
 		"CfnUrlPrefix" : {
 			"Type" : "String",
-			"Default" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.4/"
+			"Default" : "https://s3.amazonaws.com/quickstart-reference/trendmicro/deepsecurity/latest/templates/"
 		}
     },
     "Mappings"                 : {
diff --git a/templates/TMQuickStart.template b/templates/TMQuickStart.template
@@ -1,6 +1,6 @@
 {
     "AWSTemplateFormatVersion" : "2010-09-09",
-    "Description"              : "QS(0011) - v3.4 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.",
+    "Description"              : "QS(0011) - v3.7 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" : [
@@ -285,9 +285,9 @@
 										"Ref" : "ProtectedInstances"
 									},
 									"Size"
-								]
+								]	
 							}
-						]
+						]				
 					},
 					"DBIStorageAllocation"         : {
 						"Fn::FindInMap" : [
@@ -296,7 +296,7 @@
 								"Ref" : "ProtectedInstances"
 							},
 								"Size"
-						]
+						]					
 					},
 					"DBPBackupDays"         : "5",
 					"DBPCreateDbInstance"         : "Yes" ,
@@ -330,9 +330,9 @@
 										"Ref" : "ProtectedInstances"
 									},
 									"Size"
-								]
+								]	
 							}
-						]
+						]		
 					},
 					"DBISubnet1"         : {
                         "Ref" : "DatabaseSubnet1"
@@ -367,11 +367,18 @@
 					"eu-west-1"
 				]
 		},
+		"RegionIsApSoutheast2" : {
+			"Fn::Equals" : [
+				{ "Ref" : "AWS::Region" },
+				"ap-southeast-2"
+			]
+		},
 		"PerHostSupportedRegion"	: {
 			"Fn::Or" : [
 				{ "Condition" : "RegionIsWest2" },
 				{ "Condition" : "RegionIsEast1" },
-				{ "Condition" : "RegionIsEuWest1" }
+				{ "Condition" : "RegionIsEuWest1" },
+				{ "Condition" : "RegionIsApSoutheast2" }
 			]
 		}
 	},
@@ -385,4 +392,4 @@
             }
         }
     }
-}
+}
diff --git a/templates/TMQuickStartBYOL.template b/templates/TMQuickStartBYOL.template

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@`
`118`	`118`	`},`
`119`	`119`	`"CfnUrlPrefix" : {`
`120`	`120`	`"Type" : "String",`
`121`		`- "Default" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.4/"`
	`121`	`+ "Default" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.7/"`
`122`	`122`	`}`
`123`	`123`	`},`
`124`	`124`	`"Resources" : {`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@`
`35`	`35`	`},`
`36`	`36`	`"CfnUrlPrefix" : {`
`37`	`37`	`"Type" : "String",`
`38`		`- "Default" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.4/"`
	`38`	`+ "Default" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.7/"`
`39`	`39`	`}`
`40`	`40`	`},`
`41`	`41`	`"Resources" : {`