merge upgrade to RHEL7

deep-security · Mar 25, 2016 · 507c6c5 · 507c6c5
2 parents 4784f37 + 9f2af37
commit 507c6c5
Show file tree

Hide file tree

Showing 12 changed files with 87 additions and 55 deletions.
diff --git 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.1/Common/DB/DSDBOracleRDS.template",
+                "TemplateURL" : "https://s3.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.1/Common/DB/DSDBSQLRDS.template",
+                "TemplateURL" : "https://s3.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
@@ -47,7 +47,7 @@
         "ELBSG" : {
             "Type" : "AWS::CloudFormation::Stack",
             "Properties" : {
-                "TemplateURL" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.1/Common/SecurityGroups/DSELBSG.template",
+                "TemplateURL" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.2/Common/SecurityGroups/DSELBSG.template",
                 "Parameters"  : {
                     "AWSIVPC" : {
                         "Ref" : "AWSIVPC"

diff --git a/DeepSecurity/Common/Scripts/cfn-rh-helper b/DeepSecurity/Common/Scripts/cfn-rh-helper
@@ -1,12 +1,16 @@
 #!/bin/bash
 mkdir -p /etc/cfn/rhel-scripts/aws-cfn-bootstrap-latest
 cd /etc/cfn/rhel-scripts
+curl -O https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
+rpm -ivh epel-release-latest-7.noarch.rpm
+yum -y install python-pip
 curl -O https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-latest.tar.gz
 tar -zxf aws-cfn-bootstrap-latest.tar.gz -C aws-cfn-bootstrap-latest
 easy_install aws-cfn-bootstrap-latest
 easy_install pip
 pip install awscli
-ln -s /etc/cfn/rhel-scripts/aws-cfn-bootstrap-latest/aws-cfn-bootstrap-1.4/init/redhat/cfn-hup /etc/init.d/cfn-hup
+cp /etc/cfn/rhel-scripts/aws-cfn-bootstrap-latest/aws-cfn-bootstrap-1.4/init/redhat/cfn-hup /etc/init.d/cfn-hup
+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
diff --git a/DeepSecurity/Common/Scripts/cfn-rh-sql b/DeepSecurity/Common/Scripts/cfn-rh-sql
@@ -1,12 +1,12 @@
 #!/bin/bash
 cd /etc/cfn/rhel-scripts
-curl -O http://download.fedoraproject.org/pub/epel/6/i386/epel-release-6-8.noarch.rpm
-rpm -ivh epel-release-6-8.noarch.rpm
+curl -O https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
+rpm -ivh epel-release-latest-7.noarch.rpm
 yum -y install python-pip
 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.1/Common/Scripts/create-DSM-SqlDB.py
+curl -O https://s3.amazonaws.com/trend-micro-quick-start/v3.2/Common/Scripts/create-DSM-SqlDB.py
 chmod 755 create-DSM-SqlDB.py
 
diff --git a/DeepSecurity/Common/Scripts/dsm_s.service b/DeepSecurity/Common/Scripts/dsm_s.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=TrendMicro Deep Security Manager
+After=default.target
+
+[Service]
+Type=forking
+ExecStart=/etc/init.d/dsm_s start
+ExecStop=/etc/init.d/dsm_s stop
+TimeoutStartSec=0
+TimeoutStopSec=0
+
+[Install]
+WantedBy=default.target
diff --git a/DeepSecurity/DeepSecurity.cfproj b/DeepSecurity/DeepSecurity.cfproj
@@ -89,6 +89,9 @@
     <Content Include="Common\Scripts\createCloudAccount">
       <SubType>Content</SubType>
     </Content>
+    <Content Include="Common\Scripts\dsm_s.service">
+      <SubType>Content</SubType>
+    </Content>
     <Content Include="Common\Scripts\kill-mp-web-installer">
       <SubType>Content</SubType>
     </Content>

diff --git a/DeepSecurity/Marketplace/DSM96MP.template b/DeepSecurity/Marketplace/DSM96MP.template
@@ -881,22 +881,22 @@
                     "addCloudAccount" : {
 						"files" : {
 							"/etc/cfn/set-aiaSettings" : {
-								"source" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.1/Common/Scripts/set-aiaSettings",
+								"source" : "https://s3.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.1/Common/Scripts/createCloudAccount",
+								"source" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.2/Common/Scripts/createCloudAccount",
 								"owner" : "root",
 								"mode" : "000700"
 							},
 							"/etc/cfn/wait-for-relay-and-stop-manager" : {
-								"source" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.1/Common/Scripts/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",
 								"owner" : "root",
 								"mode" : "000700"
  							},
 							"/etc/cfn/kill-mp-web-installer" : {
-								"source" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.1/Common/Scripts/kill-mp-web-installer",
+								"source" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.2/Common/Scripts/kill-mp-web-installer",
 								"owner" : "root",
 								"mode" : "000700"
 							}
@@ -994,7 +994,7 @@
                     "sqlSetup"        : {
                         "commands" : {
                             "1-get-create-script" : {
-                                "command" : "cd /etc/cfn/rhel-scripts; wget https://s3.amazonaws.com/trend-micro-quick-start/v3.1/Common/Scripts/create-DSM-SqlDB.py; chmod 755 create-DSM-SqlDB.py",
+                                "command" : "cd /etc/cfn/rhel-scripts; curl -O https://s3.amazonaws.com/trend-micro-quick-start/v3.2/Common/Scripts/create-DSM-SqlDB.py; chmod 755 create-DSM-SqlDB.py",
                                 "ignoreErrors" : "false"
                             },
                             "2-create-db"         : {
@@ -1068,12 +1068,12 @@
                     "fixManagerLoadBalancerSettings" : {
 							"files" : {
 								"/etc/cfn/create-console-listener" : {
-									"source" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.1/Common/Scripts/create-console-listener",
+									"source" : "https://s3.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.1/Common/Scripts/set-lbSettings",
+									"source" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.2/Common/Scripts/set-lbSettings",
 									"owner" : "root",
 									"mode" : "000700"
 								}
@@ -1196,7 +1196,7 @@
                     "fixManagerHostObject"                 : {
                         "files" : {
                             "/etc/cfn/reactivate-manager" : {
-                                "source" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.1/Common/Scripts/reactivate-manager",
+                                "source" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.2/Common/Scripts/reactivate-manager",
                                 "owner"  : "root",
                                 "mode"   : "000700"
                             }

diff --git a/DeepSecurity/Marketplace/MasterMP96.template b/DeepSecurity/Marketplace/MasterMP96.template
@@ -307,7 +307,7 @@
             ],
             "Condition" : "LaunchRDSInstance",
             "Properties" : {
-                "TemplateURL" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.1/Marketplace/DSM96MP.template",
+                "TemplateURL" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.2/Marketplace/DSM96MP.template",
                 "Parameters"  : {
                     "AWSIKeyPairName" : {
                         "Ref" : "AWSIKeyPairName"
@@ -403,7 +403,7 @@
             ],
             "Condition" : "DSM96Node2DB",
             "Properties" : {
-                "TemplateURL" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.1/Marketplace/DSM96MP.template",
+                "TemplateURL" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.2/Marketplace/DSM96MP.template",
                 "Parameters"  : {
                     "AWSIKeyPairName" : {
                         "Ref" : "AWSIKeyPairName"
@@ -489,7 +489,7 @@
             ],
             "Condition" : "DoNotLaunchRDSInstance",
             "Properties" : {
-                "TemplateURL" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.1/Marketplace/DSM96MP.template",
+                "TemplateURL" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.2/Marketplace/DSM96MP.template",
                 "Parameters"  : {
                     "AWSIKeyPairName" : {
                         "Ref" : "AWSIKeyPairName"
@@ -579,7 +579,7 @@
             "DependsOn" : "DSM1NoDBCompleteWaitCondition",
             "Condition" : "DSM96Node2NoDB",
             "Properties" : {
-                "TemplateURL" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.1/Marketplace/DSM96MP.template",
+                "TemplateURL" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.2/Marketplace/DSM96MP.template",
                 "Parameters"  : {
                     "AWSIKeyPairName" : {
                         "Ref" : "AWSIKeyPairName"
@@ -660,7 +660,7 @@
             "Condition" : "LaunchRDSInstance",
             "DependsOn" : "DSIRDSSecurityGroup",
             "Properties" : {
-                "TemplateURL" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.1/Common/DB/DSDBAbstract.template",
+                "TemplateURL" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.2/Common/DB/DSDBAbstract.template",
                 "Parameters"  : {
                     "DBPName" : {
                         "Ref" : "DBPName"
@@ -707,7 +707,7 @@
             "Type" : "AWS::CloudFormation::Stack",
             "Condition" : "LaunchRDSInstance",
             "Properties" : {
-                "TemplateURL" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.1/Common/SecurityGroups/RDSSecurityGroup.template",
+                "TemplateURL" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.2/Common/SecurityGroups/RDSSecurityGroup.template",
                 "Parameters"  : {
                     "AWSIVPC" : {
                         "Ref" : "AWSIVPC"
@@ -727,7 +727,7 @@
         "DSIDSMSecurityGroup" : {
             "Type" : "AWS::CloudFormation::Stack",
             "Properties" : {
-                "TemplateURL" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.1/Common/SecurityGroups/DSMSecurityGroup.template",
+                "TemplateURL" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.2/Common/SecurityGroups/DSMSecurityGroup.template",
                 "Parameters"  : {
                     "AWSIVPC" : {
                         "Ref" : "AWSIVPC"
@@ -744,7 +744,7 @@
         "DSIELB"              : {
             "Type" : "AWS::CloudFormation::Stack",
             "Properties" : {
-                "TemplateURL" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.1/Common/DSM96ELB.template",
+                "TemplateURL" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.2/Common/DSM96ELB.template",
                 "Parameters"  : {
                     "AWSIVPC" : {
                         "Ref" : "AWSIVPC"
@@ -765,7 +765,7 @@
         "DSIDSMSecurityGroupIngressRules" : {
             "Type" : "AWS::CloudFormation::Stack",
             "Properties" : {
-                "TemplateURL" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.1/Common/SecurityGroups/DSMSGIngressRules.template",
+                "TemplateURL" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.2/Common/SecurityGroups/DSMSGIngressRules.template",
                 "Parameters"  : {
                     "DSMSG" : {
                         "Fn::GetAtt" : [

diff --git a/DeepSecurity/Quickstart/TMQuickStart.template b/DeepSecurity/Quickstart/TMQuickStart.template
@@ -1,6 +1,6 @@
 {
     "AWSTemplateFormatVersion" : "2010-09-09",
-    "Description"              : "v3.1 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"              : "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" : [
@@ -249,7 +249,7 @@
             "Type" : "AWS::CloudFormation::Stack",
 			"Condition" : "PerHostSupportedRegion",
             "Properties" : {
-                "TemplateURL" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.1/Marketplace/MasterMP96.template",
+                "TemplateURL" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.2/Marketplace/MasterMP96.template",
                 "Parameters"  : {
                     "AWSIKeyPairName" : {
                         "Ref" : "AWSKeyPairName"

diff --git a/DeepSecurity/Quickstart/TMQuickStartBYOL.template b/DeepSecurity/Quickstart/TMQuickStartBYOL.template
@@ -221,7 +221,7 @@
         "MasterMP96" : {
             "Type" : "AWS::CloudFormation::Stack",
             "Properties" : {
-                "TemplateURL" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.1/Marketplace/MasterMP96.template",
+                "TemplateURL" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.2/Marketplace/MasterMP96.template",
                 "Parameters"  : {
                     "AWSIKeyPairName" : {
                         "Ref" : "AWSKeyPairName"

diff --git a/DeepSecurity/RHEL/DSM96RH.template b/DeepSecurity/RHEL/DSM96RH.template
@@ -188,31 +188,34 @@
     "Mappings"                 : {
         "AWSRegionArch2AMI" : {
             "eu-central-1" : {
-                "64" : "ami-fa0538e7"
+                "64" : "ami-875042eb"
             },
             "sa-east-1"    : {
-                "64" : "ami-81fb409c"
+                "64" : "ami-27b3094b"
             },
             "ap-northeast-1" : {
-                "64" : "ami-67e01667"
+                "64" : "ami-0dd8f963"
             },
+			"ap-northeast-2" : {
+				"64" : "ami-44db152a"
+			},
             "eu-west-1"      : {
-                "64" : "ami-837de3f4"
+                "64" : "ami-8b8c57f8"
             },
             "us-east-1"      : {
-                "64" : "ami-b0fed2d8"
+                "64" : "ami-2051294a"
             },
             "us-west-1"      : {
-                "64" : "ami-f3a243b7"
+                "64" : "ami-d1315fb1"
             },
             "us-west-2"      : {
-                "64" : "ami-2faa861f"
+                "64" : "ami-775e4f16"
             },
             "ap-southeast-2" : {
-                "64" : "ami-e5ec9cdf"
+                "64" : "ami-e0c19f83"
             },
             "ap-southeast-1" : {
-                "64" : "ami-fc98a9ae"
+                "64" : "ami-3f03c55c"
             }
         },
         "TrendRegionMap" : {
@@ -709,6 +712,13 @@
                         }
                     },
                     "installDSM"     : {
+						"files" : {
+							"/etc/systemd/system/dsm_s.service" : {
+								"source" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.2/Common/Scripts/dsm_s.service",
+								"owner" : "root",
+								"mode" : "00755"
+							}
+						},
                         "commands" : {
 							"0-sethostnameinprops" : {
                                 "command" : {
@@ -726,7 +736,9 @@
                                 "command" : "cd /tmp; sh Manager-Linux-9.6.3177.x64.sh -q -console -varfile /etc/cfn/dsmConfiguration.properties >> /tmp/dsmInstallLog",
                                 "ignoreErrors" : "false"
                             },
-
+							"2-fix-for-systemd" : {
+								"command" : "systemctl daemon-reload; systemctl enable dsm_s"
+							},
 							"6-install-xml_grep" : {
                                 "command" : "yum -y install perl-XML-Twig"
                             }
@@ -735,17 +747,17 @@
                     "addCloudAccount" : {
 						"files" : {
 							"/etc/cfn/set-aiaSettings" : {
-								"source" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.1/Common/Scripts/set-aiaSettings",
+								"source" : "https://s3.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.1/Common/Scripts/createCloudAccount",
+								"source" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.2/Common/Scripts/createCloudAccount",
 								"owner" : "root",
 								"mode" : "000700"
 							},
 							"/etc/cfn/wait-for-relay-and-stop-manager" : {
-								"source" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.1/Common/Scripts/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",
 								"owner" : "root",
 								"mode" : "000700"
  							}
@@ -840,7 +852,7 @@
                     "sqlSetup"        : {
                         "commands" : {
                             "1-get-sql-helper" : {
-                                "command" : "cd /etc/cfn/rhel-scripts; wget https://s3.amazonaws.com/trend-micro-quick-start/v3.1/Common/Scripts/cfn-rh-sql; chmod 775 cfn-rh-sql",
+                                "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",
                                 "ignoreErrors" : "false"
                             },
                             "2-run-helper"     : {
@@ -910,12 +922,12 @@
 					"fixManagerLoadBalancerSettings" : {
 						"files" : {
 							"/etc/cfn/create-console-listener" : {
-								"source" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.1/Common/Scripts/create-console-listener",
+								"source" : "https://s3.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.1/Common/Scripts/set-lbSettings",
+								"source" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.2/Common/Scripts/set-lbSettings",
 								"owner" : "root",
 								"mode" : "000700"
 							}
@@ -1038,7 +1050,7 @@
 					"fixManagerHostObject" : {
 						"files" : {
 							"/etc/cfn/reactivate-manager" : {
-								"source" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.1/Common/Scripts/reactivate-manager",
+								"source" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.2/Common/Scripts/reactivate-manager",
 								"owner" : "root",
 								"mode" : "000700"
 								}
@@ -1109,7 +1121,7 @@
                             [
                                 "#!/bin/bash -xe\n",
                                 "# cloud-init\n",
-                                "wget https://s3.amazonaws.com/trend-micro-quick-start/v3.1/Common/Scripts/cfn-rh-helper\n",
+                                "curl -O https://s3.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 ",