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 @@
{
"Key":"immutable_metadata",
"Value":{"Fn::Join":["",
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"external','target':'ec2'}"
]
]
}
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"external','target':'ec2'}"
]
]
}
}
]
}
......@@ -733,15 +733,15 @@
{
"Key":"immutable_metadata",
"Value":{"Fn::Join":["",
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"external','target':'ec2'}"
]
]
}
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"external','target':'ec2'}"
]
]
}
}
]
}
......@@ -816,15 +816,15 @@
{
"Key":"immutable_metadata",
"Value":{"Fn::Join":["",
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-edxapp','target':'ec2'}"
]
]
}
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-edxapp','target':'ec2'}"
]
]
}
}
]
}
......@@ -864,15 +864,15 @@
{
"Key":"immutable_metadata",
"Value":{"Fn::Join":["",
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-edxapp','target':'ec2'}"
]
]
}
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-edxapp','target':'ec2'}"
]
]
}
}
]
}
......@@ -912,15 +912,15 @@
{
"Key" : "immutable_metadata",
"Value":{"Fn::Join":["",
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-commoncluster','target':'ec2'}"
]
]
}
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-commoncluster','target':'ec2'}"
]
]
}
}
]
}
......@@ -960,15 +960,15 @@
{
"Key" : "immutable_metadata",
"Value":{"Fn::Join":["",
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-commoncluster','target':'ec2'}"
]
]
}
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-commoncluster','target':'ec2'}"
]
]
}
}
]
}
......@@ -1008,15 +1008,15 @@
{
"Key" : "immutable_metadata",
"Value":{"Fn::Join":["",
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-commoncluster','target':'ec2'}"
]
]
}
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-commoncluster','target':'ec2'}"
]
]
}
}
]
}
......@@ -1056,15 +1056,15 @@
{
"Key" : "immutable_metadata",
"Value":{"Fn::Join":["",
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-xserver','target':'ec2'}"
]
]
}
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-xserver','target':'ec2'}"
]
]
}
}
]
}
......@@ -1104,15 +1104,15 @@
{
"Key" : "immutable_metadata",
"Value":{"Fn::Join":["",
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-xserver','target':'ec2'}"
]
]
}
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-xserver','target':'ec2'}"
]
]
}
}
]
}
......@@ -1152,15 +1152,15 @@
{
"Key" : "immutable_metadata",
"Value":{"Fn::Join":["",
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-xqwatcher','target':'ec2'}"
]
]
}
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-xqwatcher','target':'ec2'}"
]
]
}
}
]
}
......@@ -1200,15 +1200,15 @@
{
"Key" : "immutable_metadata",
"Value":{"Fn::Join":["",
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-xqwatcher','target':'ec2'}"
]
]
}
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-xqwatcher','target':'ec2'}"
]
]
}
}
]
}
......@@ -1388,15 +1388,15 @@
{
"Key" : "immutable_metadata",
"Value":{"Fn::Join":["",
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-worker','target':'ec2'}"
]
]
}
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-worker','target':'ec2'}"
]
]
}
}
]
}
......@@ -1436,15 +1436,15 @@
{
"Key" : "immutable_metadata",
"Value":{"Fn::Join":["",
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-worker','target':'ec2'}"
]
]
}
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-worker','target':'ec2'}"
]
]
}
}
]
}
......@@ -1484,15 +1484,15 @@
{
"Key" : "immutable_metadata",
"Value":{"Fn::Join":["",
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-forum','target':'ec2'}"
]
]
}
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-forum','target':'ec2'}"
]
]
}
}
]
}
......@@ -1532,15 +1532,15 @@
{
"Key" : "immutable_metadata",
"Value":{"Fn::Join":["",
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-forum','target':'ec2'}"
]
]
}
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-forum','target':'ec2'}"
]
]
}
}
]
}
......@@ -1580,15 +1580,15 @@
{
"Key" : "immutable_metadata",
"Value":{"Fn::Join":["",
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-mongo','target':'ec2'}"
]
]
}
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-mongo','target':'ec2'}"
]
]
}
}
]
}
......@@ -1628,15 +1628,15 @@
{
"Key" : "immutable_metadata",
"Value":{"Fn::Join":["",
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-mongo','target':'ec2'}"
]
]
}
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-mongo','target':'ec2'}"
]
]
}
}
]
}
......@@ -1676,15 +1676,15 @@
{
"Key" : "immutable_metadata",
"Value":{"Fn::Join":["",
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-mongo','target':'ec2'}"
]
]
}
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-mongo','target':'ec2'}"
]
]
}
}
]
}
......@@ -1724,15 +1724,15 @@
{
"Key" : "immutable_metadata",
"Value":{"Fn::Join":["",
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-notifier','target':'ec2'}"
]
]
}
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-notifier','target':'ec2'}"
]
]
}
}
]
}
......@@ -3055,17 +3055,17 @@
]
}
},
"EdxappRole": {
"Type": "AWS::IAM::Role",
"EdxappRole": {
"Type": "AWS::IAM::Role",
"Properties": {
"AssumeRolePolicyDocument": {
"Statement": [ {
"Effect": "Allow",
"Principal": {
"Service": [ "ec2.amazonaws.com" ]
},
"Action": [ "sts:AssumeRole" ]
} ]
"AssumeRolePolicyDocument": {
"Statement": [ {
"Effect": "Allow",
"Principal": {
"Service": [ "ec2.amazonaws.com" ]
},
"Action": [ "sts:AssumeRole" ]
} ]
},
"Path": "/",
"Policies": [ {
......@@ -3090,26 +3090,26 @@
} ]
}
},
"EdxappInstanceProfile": {
"EdxappInstanceProfile": {
"Type": "AWS::IAM::InstanceProfile",
"Properties": {
"Path": "/",
"Roles": [ {
"Ref": "EdxappRole"
"Ref": "EdxappRole"
} ]
}
},
"XServerRole": {
"Type": "AWS::IAM::Role",
"XServerRole": {
"Type": "AWS::IAM::Role",
"Properties": {
"AssumeRolePolicyDocument": {
"Statement": [ {
"Effect": "Allow",
"Principal": {
"Service": [ "ec2.amazonaws.com" ]
},
"Action": [ "sts:AssumeRole" ]
} ]
"AssumeRolePolicyDocument": {
"Statement": [ {
"Effect": "Allow",
"Principal": {
"Service": [ "ec2.amazonaws.com" ]
},
"Action": [ "sts:AssumeRole" ]
} ]
},
"Path": "/",
"Policies": [ {
......@@ -3133,27 +3133,26 @@
} ]
}
},
"XServerInstanceProfile": {
"XServerInstanceProfile": {
"Type": "AWS::IAM::InstanceProfile",
"Properties": {
"Path": "/",
"Roles": [ {
"Ref": "XServerRole"
"Ref": "XServerRole"
} ]
}
},
"XQWatcherRole": {
"Type": "AWS::IAM::Role",
"XQWatcherRole": {
"Type": "AWS::IAM::Role",
"Properties": {
"AssumeRolePolicyDocument": {
"Statement": [ {
"Effect": "Allow",
"Principal": {
"Service": [ "ec2.amazonaws.com" ]
},
"Action": [ "sts:AssumeRole" ]
} ]
"AssumeRolePolicyDocument": {
"Statement": [ {
"Effect": "Allow",
"Principal": {
"Service": [ "ec2.amazonaws.com" ]
},
"Action": [ "sts:AssumeRole" ]
} ]
},
"Path": "/",
"Policies": [ {
......@@ -3172,12 +3171,12 @@
} ]
}
},
"XQWatcherInstanceProfile": {
"XQWatcherInstanceProfile": {
"Type": "AWS::IAM::InstanceProfile",
"Properties": {
"Path": "/",
"Roles": [ {
"Ref": "XQWatcherRole"
"Ref": "XQWatcherRole"
} ]
}
},
......@@ -3246,7 +3245,7 @@
"EdxappServer":{
"Type":"AWS::AutoScaling::LaunchConfiguration",
"Properties":{
"IamInstanceProfile":{ "Ref":"EdxappInstanceProfile" },
"IamInstanceProfile":{ "Ref":"EdxappInstanceProfile" },
"SecurityGroups":[
{
"Ref":"EdxappServerSecurityGroup"
......@@ -4127,7 +4126,7 @@
"FromPort":"5672",
"ToPort":"5672",
"SourceSecurityGroupId": { "Ref": "NotifierSecurityGroup" }
}
}
],
"SecurityGroupEgress":[
{
......@@ -4939,7 +4938,7 @@
"WorkerServer":{
"Type":"AWS::AutoScaling::LaunchConfiguration",
"Properties":{
"IamInstanceProfile":{ "Ref":"EdxappInstanceProfile" },
"IamInstanceProfile":{ "Ref":"EdxappInstanceProfile" },
"SecurityGroups":[
{
"Ref":"WorkerServerSecurityGroup"
......@@ -5373,11 +5372,11 @@
],
"HealthCheck":{
"Target":{"Fn::Join":["",
["TCP:",
{"Ref":"ForumServerPort"}
]
]
},
["TCP:",
{"Ref":"ForumServerPort"}
]
]
},
"HealthyThreshold":"3",
"UnhealthyThreshold":"5",
"Interval":"30",
......@@ -5874,17 +5873,17 @@
"VpcSecurityGroupIds" : [ { "Ref" : "CacheSecurityGroup" } ]
}
},
"NotifierRole": {
"Type": "AWS::IAM::Role",
"NotifierRole": {
"Type": "AWS::IAM::Role",
"Properties": {
"AssumeRolePolicyDocument": {
"Statement": [ {
"Effect": "Allow",
"Principal": {
"Service": [ "ec2.amazonaws.com" ]
},
"Action": [ "sts:AssumeRole" ]
} ]
"AssumeRolePolicyDocument": {
"Statement": [ {
"Effect": "Allow",
"Principal": {
"Service": [ "ec2.amazonaws.com" ]
},
"Action": [ "sts:AssumeRole" ]
} ]
},
"Path": "/",
"Policies": [ {
......@@ -5907,12 +5906,12 @@
} ]
}
},
"NotifierInstanceProfile": {
"NotifierInstanceProfile": {
"Type": "AWS::IAM::InstanceProfile",
"Properties": {
"Path": "/",
"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