Merge pull request #2 from trend-scottb/develop

santiagocardenas · santiagocardenas · commit ede9fe01f832 · 2016-05-17T12:08:59.000-07:00
Fixed line ending issues
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
@@ -9,4 +9,3 @@ 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
 chmod 755 create-DSM-SqlDB.py
-
diff --git a/templates/Common/Scripts/cfn-rh-sql~ b/templates/Common/Scripts/cfn-rh-sql~
diff --git a/templates/Common/Scripts/create-DSM-SqlDB.py b/templates/Common/Scripts/create-DSM-SqlDB.py
@@ -17,7 +17,3 @@
 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,3 +3,4 @@
 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/create-console-listener~ b/templates/Common/Scripts/create-console-listener~
diff --git a/templates/Common/Scripts/createCloudAccount b/templates/Common/Scripts/createCloudAccount
@@ -55,5 +55,3 @@ unset tempDSSID
 unset username
 unset password
 
-
-
diff --git a/templates/Common/Scripts/createCloudAccountGc b/templates/Common/Scripts/createCloudAccountGc
@@ -56,4 +56,3 @@ unset secretkey
 unset tempDSSID
 unset username
 unset password
-
diff --git a/templates/Common/Scripts/createCloudAccountGc~ b/templates/Common/Scripts/createCloudAccountGc~
diff --git a/templates/Common/Scripts/dsm_s.service b/templates/Common/Scripts/dsm_s.service
@@ -11,3 +11,4 @@ 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,3 +131,4 @@ 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
@@ -82,3 +82,4 @@ 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,5 +44,3 @@ 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,3 +10,4 @@ do
 done
 
 service dsm_s stop
+
