Skip to content

C
configuration
Commit a9b2dee2 by e0d
Options

fixing whitespace

parent bdf40aa1
Showing with 227 additions and 228 deletions
cloudformation_templates/edx-reference-architecture.json
...@@ -693,15 +693,15 @@ ...@@ -693,15 +693,15 @@
{ {
"Key":"immutable_metadata", "Key":"immutable_metadata",
"Value":{"Fn::Join":["", "Value":{"Fn::Join":["",
["{'purpose':'", ["{'purpose':'",
{"Ref":"EnvironmentTag"}, {"Ref":"EnvironmentTag"},
"-", "-",
{"Ref":"DeploymentTag"}, {"Ref":"DeploymentTag"},
"-", "-",
"external','target':'ec2'}" "external','target':'ec2'}"
] ]
] ]
} }
} }
] ]
} }
...@@ -733,15 +733,15 @@ ...@@ -733,15 +733,15 @@
{ {
"Key":"immutable_metadata", "Key":"immutable_metadata",
"Value":{"Fn::Join":["", "Value":{"Fn::Join":["",
["{'purpose':'", ["{'purpose':'",
{"Ref":"EnvironmentTag"}, {"Ref":"EnvironmentTag"},
"-", "-",
{"Ref":"DeploymentTag"}, {"Ref":"DeploymentTag"},
"-", "-",
"external','target':'ec2'}" "external','target':'ec2'}"
] ]
] ]
} }
} }
] ]
} }
...@@ -816,15 +816,15 @@ ...@@ -816,15 +816,15 @@
{ {
"Key":"immutable_metadata", "Key":"immutable_metadata",
"Value":{"Fn::Join":["", "Value":{"Fn::Join":["",
["{'purpose':'", ["{'purpose':'",
{"Ref":"EnvironmentTag"}, {"Ref":"EnvironmentTag"},
"-", "-",
{"Ref":"DeploymentTag"}, {"Ref":"DeploymentTag"},
"-", "-",
"internal-edxapp','target':'ec2'}" "internal-edxapp','target':'ec2'}"
] ]
] ]
} }
} }
] ]
} }
...@@ -864,15 +864,15 @@ ...@@ -864,15 +864,15 @@
{ {
"Key":"immutable_metadata", "Key":"immutable_metadata",
"Value":{"Fn::Join":["", "Value":{"Fn::Join":["",
["{'purpose':'", ["{'purpose':'",
{"Ref":"EnvironmentTag"}, {"Ref":"EnvironmentTag"},
"-", "-",
{"Ref":"DeploymentTag"}, {"Ref":"DeploymentTag"},
"-", "-",
"internal-edxapp','target':'ec2'}" "internal-edxapp','target':'ec2'}"
] ]
] ]
} }
} }
] ]
} }
...@@ -912,15 +912,15 @@ ...@@ -912,15 +912,15 @@
{ {
"Key" : "immutable_metadata", "Key" : "immutable_metadata",
"Value":{"Fn::Join":["", "Value":{"Fn::Join":["",
["{'purpose':'", ["{'purpose':'",
{"Ref":"EnvironmentTag"}, {"Ref":"EnvironmentTag"},
"-", "-",
{"Ref":"DeploymentTag"}, {"Ref":"DeploymentTag"},
"-", "-",
"internal-commoncluster','target':'ec2'}" "internal-commoncluster','target':'ec2'}"
] ]
] ]
} }
} }
] ]
} }
...@@ -960,15 +960,15 @@ ...@@ -960,15 +960,15 @@
{ {
"Key" : "immutable_metadata", "Key" : "immutable_metadata",
"Value":{"Fn::Join":["", "Value":{"Fn::Join":["",
["{'purpose':'", ["{'purpose':'",
{"Ref":"EnvironmentTag"}, {"Ref":"EnvironmentTag"},
"-", "-",
{"Ref":"DeploymentTag"}, {"Ref":"DeploymentTag"},
"-", "-",
"internal-commoncluster','target':'ec2'}" "internal-commoncluster','target':'ec2'}"
] ]
] ]
} }
} }
] ]
} }
...@@ -1008,15 +1008,15 @@ ...@@ -1008,15 +1008,15 @@
{ {
"Key" : "immutable_metadata", "Key" : "immutable_metadata",
"Value":{"Fn::Join":["", "Value":{"Fn::Join":["",
["{'purpose':'", ["{'purpose':'",
{"Ref":"EnvironmentTag"}, {"Ref":"EnvironmentTag"},
"-", "-",
{"Ref":"DeploymentTag"}, {"Ref":"DeploymentTag"},
"-", "-",
"internal-commoncluster','target':'ec2'}" "internal-commoncluster','target':'ec2'}"
] ]
] ]
} }
} }
] ]
} }
...@@ -1056,15 +1056,15 @@ ...@@ -1056,15 +1056,15 @@
{ {
"Key" : "immutable_metadata", "Key" : "immutable_metadata",
"Value":{"Fn::Join":["", "Value":{"Fn::Join":["",
["{'purpose':'", ["{'purpose':'",
{"Ref":"EnvironmentTag"}, {"Ref":"EnvironmentTag"},
"-", "-",
{"Ref":"DeploymentTag"}, {"Ref":"DeploymentTag"},
"-", "-",
"internal-xserver','target':'ec2'}" "internal-xserver','target':'ec2'}"
] ]
] ]
} }
} }
] ]
} }
...@@ -1104,15 +1104,15 @@ ...@@ -1104,15 +1104,15 @@
{ {
"Key" : "immutable_metadata", "Key" : "immutable_metadata",
"Value":{"Fn::Join":["", "Value":{"Fn::Join":["",
["{'purpose':'", ["{'purpose':'",
{"Ref":"EnvironmentTag"}, {"Ref":"EnvironmentTag"},
"-", "-",
{"Ref":"DeploymentTag"}, {"Ref":"DeploymentTag"},
"-", "-",
"internal-xserver','target':'ec2'}" "internal-xserver','target':'ec2'}"
] ]
] ]
} }
} }
] ]
} }
...@@ -1152,15 +1152,15 @@ ...@@ -1152,15 +1152,15 @@
{ {
"Key" : "immutable_metadata", "Key" : "immutable_metadata",
"Value":{"Fn::Join":["", "Value":{"Fn::Join":["",
["{'purpose':'", ["{'purpose':'",
{"Ref":"EnvironmentTag"}, {"Ref":"EnvironmentTag"},
"-", "-",
{"Ref":"DeploymentTag"}, {"Ref":"DeploymentTag"},
"-", "-",
"internal-xqwatcher','target':'ec2'}" "internal-xqwatcher','target':'ec2'}"
] ]
] ]
} }
} }
] ]
} }
...@@ -1200,15 +1200,15 @@ ...@@ -1200,15 +1200,15 @@
{ {
"Key" : "immutable_metadata", "Key" : "immutable_metadata",
"Value":{"Fn::Join":["", "Value":{"Fn::Join":["",
["{'purpose':'", ["{'purpose':'",
{"Ref":"EnvironmentTag"}, {"Ref":"EnvironmentTag"},
"-", "-",
{"Ref":"DeploymentTag"}, {"Ref":"DeploymentTag"},
"-", "-",
"internal-xqwatcher','target':'ec2'}" "internal-xqwatcher','target':'ec2'}"
] ]
] ]
} }
} }
] ]
} }
...@@ -1388,15 +1388,15 @@ ...@@ -1388,15 +1388,15 @@
{ {
"Key" : "immutable_metadata", "Key" : "immutable_metadata",
"Value":{"Fn::Join":["", "Value":{"Fn::Join":["",
["{'purpose':'", ["{'purpose':'",
{"Ref":"EnvironmentTag"}, {"Ref":"EnvironmentTag"},
"-", "-",
{"Ref":"DeploymentTag"}, {"Ref":"DeploymentTag"},
"-", "-",
"internal-worker','target':'ec2'}" "internal-worker','target':'ec2'}"
] ]
] ]
} }
} }
] ]
} }
...@@ -1436,15 +1436,15 @@ ...@@ -1436,15 +1436,15 @@
{ {
"Key" : "immutable_metadata", "Key" : "immutable_metadata",
"Value":{"Fn::Join":["", "Value":{"Fn::Join":["",
["{'purpose':'", ["{'purpose':'",
{"Ref":"EnvironmentTag"}, {"Ref":"EnvironmentTag"},
"-", "-",
{"Ref":"DeploymentTag"}, {"Ref":"DeploymentTag"},
"-", "-",
"internal-worker','target':'ec2'}" "internal-worker','target':'ec2'}"
] ]
] ]
} }
} }
] ]
} }
...@@ -1484,15 +1484,15 @@ ...@@ -1484,15 +1484,15 @@
{ {
"Key" : "immutable_metadata", "Key" : "immutable_metadata",
"Value":{"Fn::Join":["", "Value":{"Fn::Join":["",
["{'purpose':'", ["{'purpose':'",
{"Ref":"EnvironmentTag"}, {"Ref":"EnvironmentTag"},
"-", "-",
{"Ref":"DeploymentTag"}, {"Ref":"DeploymentTag"},
"-", "-",
"internal-forum','target':'ec2'}" "internal-forum','target':'ec2'}"
] ]
] ]
} }
} }
] ]
} }
...@@ -1532,15 +1532,15 @@ ...@@ -1532,15 +1532,15 @@
{ {
"Key" : "immutable_metadata", "Key" : "immutable_metadata",
"Value":{"Fn::Join":["", "Value":{"Fn::Join":["",
["{'purpose':'", ["{'purpose':'",
{"Ref":"EnvironmentTag"}, {"Ref":"EnvironmentTag"},
"-", "-",
{"Ref":"DeploymentTag"}, {"Ref":"DeploymentTag"},
"-", "-",
"internal-forum','target':'ec2'}" "internal-forum','target':'ec2'}"
] ]
] ]
} }
} }
] ]
} }
...@@ -1580,15 +1580,15 @@ ...@@ -1580,15 +1580,15 @@
{ {
"Key" : "immutable_metadata", "Key" : "immutable_metadata",
"Value":{"Fn::Join":["", "Value":{"Fn::Join":["",
["{'purpose':'", ["{'purpose':'",
{"Ref":"EnvironmentTag"}, {"Ref":"EnvironmentTag"},
"-", "-",
{"Ref":"DeploymentTag"}, {"Ref":"DeploymentTag"},
"-", "-",
"internal-mongo','target':'ec2'}" "internal-mongo','target':'ec2'}"
] ]
] ]
} }
} }
] ]
} }
...@@ -1628,15 +1628,15 @@ ...@@ -1628,15 +1628,15 @@
{ {
"Key" : "immutable_metadata", "Key" : "immutable_metadata",
"Value":{"Fn::Join":["", "Value":{"Fn::Join":["",
["{'purpose':'", ["{'purpose':'",
{"Ref":"EnvironmentTag"}, {"Ref":"EnvironmentTag"},
"-", "-",
{"Ref":"DeploymentTag"}, {"Ref":"DeploymentTag"},
"-", "-",
"internal-mongo','target':'ec2'}" "internal-mongo','target':'ec2'}"
] ]
] ]
} }
} }
] ]
} }
...@@ -1676,15 +1676,15 @@ ...@@ -1676,15 +1676,15 @@
{ {
"Key" : "immutable_metadata", "Key" : "immutable_metadata",
"Value":{"Fn::Join":["", "Value":{"Fn::Join":["",
["{'purpose':'", ["{'purpose':'",
{"Ref":"EnvironmentTag"}, {"Ref":"EnvironmentTag"},
"-", "-",
{"Ref":"DeploymentTag"}, {"Ref":"DeploymentTag"},
"-", "-",
"internal-mongo','target':'ec2'}" "internal-mongo','target':'ec2'}"
] ]
] ]
} }
} }
] ]
} }
...@@ -1724,15 +1724,15 @@ ...@@ -1724,15 +1724,15 @@
{ {
"Key" : "immutable_metadata", "Key" : "immutable_metadata",
"Value":{"Fn::Join":["", "Value":{"Fn::Join":["",
["{'purpose':'", ["{'purpose':'",
{"Ref":"EnvironmentTag"}, {"Ref":"EnvironmentTag"},
"-", "-",
{"Ref":"DeploymentTag"}, {"Ref":"DeploymentTag"},
"-", "-",
"internal-notifier','target':'ec2'}" "internal-notifier','target':'ec2'}"
] ]
] ]
} }
} }
] ]
} }
...@@ -3055,17 +3055,17 @@ ...@@ -3055,17 +3055,17 @@
] ]
} }
}, },
"EdxappRole": { "EdxappRole": {
"Type": "AWS::IAM::Role", "Type": "AWS::IAM::Role",
"Properties": { "Properties": {
"AssumeRolePolicyDocument": { "AssumeRolePolicyDocument": {
"Statement": [ { "Statement": [ {
"Effect": "Allow", "Effect": "Allow",
"Principal": { "Principal": {
"Service": [ "ec2.amazonaws.com" ] "Service": [ "ec2.amazonaws.com" ]
}, },
"Action": [ "sts:AssumeRole" ] "Action": [ "sts:AssumeRole" ]
} ] } ]
}, },
"Path": "/", "Path": "/",
"Policies": [ { "Policies": [ {
...@@ -3090,26 +3090,26 @@ ...@@ -3090,26 +3090,26 @@
} ] } ]
} }
}, },
"EdxappInstanceProfile": { "EdxappInstanceProfile": {
"Type": "AWS::IAM::InstanceProfile", "Type": "AWS::IAM::InstanceProfile",
"Properties": { "Properties": {
"Path": "/", "Path": "/",
"Roles": [ { "Roles": [ {
"Ref": "EdxappRole" "Ref": "EdxappRole"
} ] } ]
} }
}, },
"XServerRole": { "XServerRole": {
"Type": "AWS::IAM::Role", "Type": "AWS::IAM::Role",
"Properties": { "Properties": {
"AssumeRolePolicyDocument": { "AssumeRolePolicyDocument": {
"Statement": [ { "Statement": [ {
"Effect": "Allow", "Effect": "Allow",
"Principal": { "Principal": {
"Service": [ "ec2.amazonaws.com" ] "Service": [ "ec2.amazonaws.com" ]
}, },
"Action": [ "sts:AssumeRole" ] "Action": [ "sts:AssumeRole" ]
} ] } ]
}, },
"Path": "/", "Path": "/",
"Policies": [ { "Policies": [ {
...@@ -3133,27 +3133,26 @@ ...@@ -3133,27 +3133,26 @@
} ] } ]
} }
}, },
"XServerInstanceProfile": { "XServerInstanceProfile": {
"Type": "AWS::IAM::InstanceProfile", "Type": "AWS::IAM::InstanceProfile",
"Properties": { "Properties": {
"Path": "/", "Path": "/",
"Roles": [ { "Roles": [ {
"Ref": "XServerRole" "Ref": "XServerRole"
} ] } ]
} }
}, },
"XQWatcherRole": {
"XQWatcherRole": { "Type": "AWS::IAM::Role",
"Type": "AWS::IAM::Role",
"Properties": { "Properties": {
"AssumeRolePolicyDocument": { "AssumeRolePolicyDocument": {
"Statement": [ { "Statement": [ {
"Effect": "Allow", "Effect": "Allow",
"Principal": { "Principal": {
"Service": [ "ec2.amazonaws.com" ] "Service": [ "ec2.amazonaws.com" ]
}, },
"Action": [ "sts:AssumeRole" ] "Action": [ "sts:AssumeRole" ]
} ] } ]
}, },
"Path": "/", "Path": "/",
"Policies": [ { "Policies": [ {
...@@ -3172,12 +3171,12 @@ ...@@ -3172,12 +3171,12 @@
} ] } ]
} }
}, },
"XQWatcherInstanceProfile": { "XQWatcherInstanceProfile": {
"Type": "AWS::IAM::InstanceProfile", "Type": "AWS::IAM::InstanceProfile",
"Properties": { "Properties": {
"Path": "/", "Path": "/",
"Roles": [ { "Roles": [ {
"Ref": "XQWatcherRole" "Ref": "XQWatcherRole"
} ] } ]
} }
}, },
...@@ -3246,7 +3245,7 @@ ...@@ -3246,7 +3245,7 @@
"EdxappServer":{ "EdxappServer":{
"Type":"AWS::AutoScaling::LaunchConfiguration", "Type":"AWS::AutoScaling::LaunchConfiguration",
"Properties":{ "Properties":{
"IamInstanceProfile":{ "Ref":"EdxappInstanceProfile" }, "IamInstanceProfile":{ "Ref":"EdxappInstanceProfile" },
"SecurityGroups":[ "SecurityGroups":[
{ {
"Ref":"EdxappServerSecurityGroup" "Ref":"EdxappServerSecurityGroup"
...@@ -4127,7 +4126,7 @@ ...@@ -4127,7 +4126,7 @@
"FromPort":"5672", "FromPort":"5672",
"ToPort":"5672", "ToPort":"5672",
"SourceSecurityGroupId": { "Ref": "NotifierSecurityGroup" } "SourceSecurityGroupId": { "Ref": "NotifierSecurityGroup" }
} }
], ],
"SecurityGroupEgress":[ "SecurityGroupEgress":[
{ {
...@@ -4939,7 +4938,7 @@ ...@@ -4939,7 +4938,7 @@
"WorkerServer":{ "WorkerServer":{
"Type":"AWS::AutoScaling::LaunchConfiguration", "Type":"AWS::AutoScaling::LaunchConfiguration",
"Properties":{ "Properties":{
"IamInstanceProfile":{ "Ref":"EdxappInstanceProfile" }, "IamInstanceProfile":{ "Ref":"EdxappInstanceProfile" },
"SecurityGroups":[ "SecurityGroups":[
{ {
"Ref":"WorkerServerSecurityGroup" "Ref":"WorkerServerSecurityGroup"
...@@ -5373,11 +5372,11 @@ ...@@ -5373,11 +5372,11 @@
], ],
"HealthCheck":{ "HealthCheck":{
"Target":{"Fn::Join":["", "Target":{"Fn::Join":["",
["TCP:", ["TCP:",
{"Ref":"ForumServerPort"} {"Ref":"ForumServerPort"}
] ]
] ]
}, },
"HealthyThreshold":"3", "HealthyThreshold":"3",
"UnhealthyThreshold":"5", "UnhealthyThreshold":"5",
"Interval":"30", "Interval":"30",
...@@ -5874,17 +5873,17 @@ ...@@ -5874,17 +5873,17 @@
"VpcSecurityGroupIds" : [ { "Ref" : "CacheSecurityGroup" } ] "VpcSecurityGroupIds" : [ { "Ref" : "CacheSecurityGroup" } ]
} }
}, },
"NotifierRole": { "NotifierRole": {
"Type": "AWS::IAM::Role", "Type": "AWS::IAM::Role",
"Properties": { "Properties": {
"AssumeRolePolicyDocument": { "AssumeRolePolicyDocument": {
"Statement": [ { "Statement": [ {
"Effect": "Allow", "Effect": "Allow",
"Principal": { "Principal": {
"Service": [ "ec2.amazonaws.com" ] "Service": [ "ec2.amazonaws.com" ]
}, },
"Action": [ "sts:AssumeRole" ] "Action": [ "sts:AssumeRole" ]
} ] } ]
}, },
"Path": "/", "Path": "/",
"Policies": [ { "Policies": [ {
...@@ -5907,12 +5906,12 @@ ...@@ -5907,12 +5906,12 @@
} ] } ]
} }
}, },
"NotifierInstanceProfile": { "NotifierInstanceProfile": {
"Type": "AWS::IAM::InstanceProfile", "Type": "AWS::IAM::InstanceProfile",
"Properties": { "Properties": {
"Path": "/", "Path": "/",
"Roles": [ { "Roles": [ {
"Ref": "NotifierRole" "Ref": "NotifierRole"
} ] } ]
} }
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment