- Changing line endings for the bash script

- Adding editorconfig to try to help with line endings
- Added shebang so script will execute

Author: lukewis

.editorconfig

@@ -0,0 +1,9 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true

scripts/mongoanddockerinit.sh

@@ -1,3 +1,4 @@
+#!/bin/bash
 USERNAME=""
 PASSWORD=""
 
@@ -33,7 +34,13 @@ sudo mkdir -p /data/db
 sudo mount /dev/xvdh /data/db
 
 # Setup the repository for installing mongo
-echo "[mongodb-org-3.2]\nname=MongoDB Repository\nbaseurl=https://repo.mongodb.org/yum/amazon/2013.03/mongodb-org/3.2/x86_64/\ngpgcheck=1\nenabled=1\ngpgkey=https://www.mongodb.org/static/pgp/server-3.2.asc\n" > /etc/yum.repos.d/mongodb-org-3.2.repo
+echo "[mongodb-org-3.2]
+name=MongoDB Repository
+baseurl=https://repo.mongodb.org/yum/amazon/2013.03/mongodb-org/3.2/x86_64/
+gpgcheck=1
+enabled=1
+gpgkey=https://www.mongodb.org/static/pgp/server-3.2.asc
+" > /etc/yum.repos.d/mongodb-org-3.2.repo
 sudo yum -y update
 # Install mongo server, shell and tools
 sudo yum install -y mongodb-org-server mongodb-org-shell mongodb-org-tools

templates/mongoanddocker.template

@@ -41,11 +41,12 @@
 		},
         "DbAdminUsername": {
 			"Description": "Username for the admin user of the database",
-			"Type": "String"		
+			"Type": "String"					
 		},
         "DbAdminPassword": {
 			"Description": "Password for the admin user of the database",
-			"Type": "String"	
+			"Type": "String",
+			"NoEcho": true	
 		}
 	},
 	"Conditions": {
@@ -127,7 +128,48 @@
 			}
 		}
 	},
-	"Resources": {
+	"Resources": {		
+		"EC2InstanceRole": {
+			"Type": "AWS::IAM::Role",
+			"Properties": {
+				"AssumeRolePolicyDocument": {
+					"Version" : "2012-10-17",
+					"Statement": [ {
+						"Effect": "Allow",
+						"Principal": {
+							"Service": [ "ec2.amazonaws.com" ]
+						},
+						"Action": [ "sts:AssumeRole" ]
+					} ]
+				},
+				"Policies": [
+					{
+						"PolicyName": "MongoAndDockerInstancePolicy",
+						"PolicyDocument": {
+							"Version": "2012-10-17",
+							"Statement": [
+								{
+									"Effect": "Allow",
+									"Action": [
+										"s3:Get*",
+										"s3:List*"
+									],
+									"Resource": "*"
+								}
+							]
+						}
+					}
+				]
+			}
+		},
+		"EC2InstanceProfile": {
+			"Type": "AWS::IAM::InstanceProfile",
+			"Properties":{
+				"Roles": [
+					{ "Ref": "EC2InstanceRole" }
+				]				
+			}			
+		},
 		"NewSecurityGroup": {
 			"Type": "AWS::EC2::SecurityGroup",
 			"Condition": "CreateNewSecurityGroup",
@@ -151,6 +193,7 @@
 				"InstanceType": {
 					"Ref": "InstanceType"
 				},
+				"IamInstanceProfile": { "Ref": "EC2InstanceProfile" },
 				"SecurityGroups": [
 					"SSH from home"
 				],
@@ -180,14 +223,13 @@
                             "#!/bin/bash -xe\n",
 							"sudo yum -y update\n",
 							"sudo yum install -y git\n",	
-							"git config --global user.name lukewis\n",
-							"git config --global user.email [email protected]\n",
-							"git clone https://github.com/lukewis/aws.git\n",
-							"./aws/scripts/mongoanddockerinit.sh -u ",
+							"mkdir -p /aws/scripts/\n",
+							"aws s3 cp s3://com.figtreesoftware.cf.scripts/mongoanddockerinit.sh /aws/scripts/mongoanddockerinit.sh\n",
+							"sudo chmod +x /aws/scripts/mongoanddockerinit.sh\n",
+							"/aws/scripts/mongoanddockerinit.sh -u ",
 							{ "Ref" : "DbAdminUsername" },
 							" -p ",
-							{ "Ref" : "DbAdminPassword" },
-							"\n"                            
+							{ "Ref" : "DbAdminPassword" }                            
 						]]
 					}
 				}