Skip to content

C
configuration
Commit 40b1a182 by Joe Blaylock
Options

Merge pull request #13 from edx/bugfixes/jbau/ami_and_sync_hooks 

Bugfixes/jbau/ami and sync hooks
parents 40693cea d6e7e02e
Showing with 4 additions and 4 deletions
cloudformation_templates/edx-server-multi-instance.json
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
"AWSRegionArch2AMI" : { "AWSRegionArch2AMI" : {
"us-east-1" : { "32" : "ami-def89fb7", "64" : "ami-d0f89fb9" }, "us-east-1" : { "32" : "ami-def89fb7", "64" : "ami-d0f89fb9" },
"us-west-1" : { "32" : "ami-fc002cb9", "64" : "ami-ce7b6fba" }, "us-west-1" : { "32" : "ami-fc002cb9", "64" : "ami-fe002cbb" },
"us-west-2" : { "32" : "ami-0ef96e3e", "64" : "ami-70f96e40" }, "us-west-2" : { "32" : "ami-0ef96e3e", "64" : "ami-70f96e40" },
"eu-west-1" : { "32" : "ami-c27b6fb6", "64" : "ami-ce7b6fba" }, "eu-west-1" : { "32" : "ami-c27b6fb6", "64" : "ami-ce7b6fba" },
"sa-east-1" : { "32" : "ami-a1da00bc", "64" : "ami-a3da00be" }, "sa-east-1" : { "32" : "ami-a1da00bc", "64" : "ami-a3da00be" },
......
cloudformation_templates/edx-server-single-instance.json
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
"AWSRegionArch2AMI" : { "AWSRegionArch2AMI" : {
"us-east-1" : { "32" : "ami-def89fb7", "64" : "ami-d0f89fb9" }, "us-east-1" : { "32" : "ami-def89fb7", "64" : "ami-d0f89fb9" },
"us-west-1" : { "32" : "ami-fc002cb9", "64" : "ami-ce7b6fba" }, "us-west-1" : { "32" : "ami-fc002cb9", "64" : "ami-fe002cbb" },
"us-west-2" : { "32" : "ami-0ef96e3e", "64" : "ami-70f96e40" }, "us-west-2" : { "32" : "ami-0ef96e3e", "64" : "ami-70f96e40" },
"eu-west-1" : { "32" : "ami-c27b6fb6", "64" : "ami-ce7b6fba" }, "eu-west-1" : { "32" : "ami-c27b6fb6", "64" : "ami-ce7b6fba" },
"sa-east-1" : { "32" : "ami-a1da00bc", "64" : "ami-a3da00be" }, "sa-east-1" : { "32" : "ami-a1da00bc", "64" : "ami-a3da00be" },
......
playbooks/files/edx-server-ubuntu-configuration.json
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
"AWSRegionArch2AMI" : { "AWSRegionArch2AMI" : {
"us-east-1" : { "32" : "ami-def89fb7", "64" : "ami-d0f89fb9" }, "us-east-1" : { "32" : "ami-def89fb7", "64" : "ami-d0f89fb9" },
"us-west-1" : { "32" : "ami-fc002cb9", "64" : "ami-ce7b6fba" }, "us-west-1" : { "32" : "ami-fc002cb9", "64" : "ami-fe002cbb" },
"us-west-2" : { "32" : "ami-0ef96e3e", "64" : "ami-70f96e40" }, "us-west-2" : { "32" : "ami-0ef96e3e", "64" : "ami-70f96e40" },
"eu-west-1" : { "32" : "ami-c27b6fb6", "64" : "ami-ce7b6fba" }, "eu-west-1" : { "32" : "ami-c27b6fb6", "64" : "ami-ce7b6fba" },
"sa-east-1" : { "32" : "ami-a1da00bc", "64" : "ami-a3da00be" }, "sa-east-1" : { "32" : "ami-a1da00bc", "64" : "ami-a3da00be" },
......
util/sync_hooks.sh
...@@ -19,7 +19,7 @@ for file in git-hooks/*.in; do ...@@ -19,7 +19,7 @@ for file in git-hooks/*.in; do
cd $STARTED_FROM cd $STARTED_FROM
exit 1 exit 1
else else
ln -v -s -b -f `pwd`/$file .git/hooks/$filepart ln -v -s -f `pwd`/$file .git/hooks/$filepart
fi fi
done done
......
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