Merge pull request #8 from trend-scottb/develop

Updated templates to version 5.3 for Deep Security 10.1

Author: santiagocardenas

…ts/add-aws-account-with-instance-role.sh …ts/add-aws-account-with-instance-role.shtemplates/Common/Scripts/add-aws-account-with-instance-role.sh renamed to scripts/add-aws-account-with-instance-role.sh templates/Common/Scripts/add-aws-account-with-instance-role.sh renamed to scripts/add-aws-account-with-instance-role.sh

@@ -1,27 +1,25 @@
 #!/bin/bash
-# cloudAccountCreateWithInstanceRole.sh dsmuser dsmpass manager address guiPort tenant
+# cloudAccountCreateWithInstanceRole.sh dsmuser dsmpass manager address guiPort region tenant
 username=$1
 password=$2
-tenant=$5
+tenant=$6
+region=$5
 
 # replace this with your DSM IP or FQDN
 DSMURL="$3:$4"
 
-
 echo "#####Login to DSM"
-if [[ -z $tenant ]]
+if [[ -z ${tenant} ]]
   then
       SID=`curl -ks -H "Content-Type: application/json" -X POST "https://${DSMURL}/rest/authentication/login/primary" -d '{"dsCredentials":{"userName":"'${username}'","password":"'${password}'"}}'`
   else
       SID=`curl -ks -H "Content-Type: application/json" -X POST "https://${DSMURL}/rest/authentication/login" -d '{"dsCredentials":{"userName":"'${username}'","password":"'${password}'","tenantName":"'${tenant}'"}}'`
 fi
 
-curl -ks --cookie "sID=${SID}" -H "Content-Type: application/json" "Accept: application/json" -X POST "https://${DSMURL}/rest/cloudaccounts/aws" -d '{"AddAwsAccountRequest":{"useInstanceRole":true}}'
+curl -ks --cookie "sID=${SID}" -H "Content-Type: application/json" "Accept: application/json" -X POST "https://${DSMURL}/rest/cloudaccounts/aws" -d '{"AddAwsAccountRequest":{"useInstanceRole":true, "seedRegion":"'${region}'"}}'
 
-curl -k -X DELETE https://$DSMURL/rest/authentication/logout?sID=$tempDSSID
+curl -k -X DELETE https://${DSMURL}/rest/authentication/logout?sID=${SID}
 
 unset SID
 unset username
-unset password
-
-
+unset password

…ommon/Scripts/create-console-listener.sh scripts/create-console-listener.shtemplates/Common/Scripts/create-console-listener.sh renamed to scripts/create-console-listener.sh templates/Common/Scripts/create-console-listener.sh renamed to scripts/create-console-listener.sh

@@ -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 $3 --policy-names DSMConsoleStickySessions --region $6

templates/Common/Scripts/create-dsm-db.py scripts/create-dsm-db.pytemplates/Common/Scripts/create-dsm-db.py renamed to scripts/create-dsm-db.py

@@ -1,3 +1,4 @@
+#!/bin/bash
 ##reactivate-manager <username> <password> <console-port>
 dnsHostNamesOn=
 ## get a token

…/Common/Scripts/kill-mp-web-installer.sh scripts/kill-mp-web-installer.shtemplates/Common/Scripts/kill-mp-web-installer.sh renamed to scripts/kill-mp-web-installer.sh templates/Common/Scripts/kill-mp-web-installer.sh renamed to scripts/kill-mp-web-installer.sh

@@ -78,5 +78,5 @@ 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"
+curl -k -X DELETE https://localhost:$4/rest/authentication/logout?sID="$SID"
 exit