Skip to content

Commit

Permalink
Fixing some errors
Browse files Browse the repository at this point in the history
  • Loading branch information
igalarzab committed Mar 21, 2013
1 parent 3fdca71 commit 524b51b
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 15 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ Executed commands
--ssh-port 2222 --sudo --run-list "role[tryit-vagrant]"

# EC2 Example
$ knife ec2 server create -r 'role[tryit-worker]' -I ami-3d4ff254 \
-x ubuntu -i $HOME/.ssh/aws-carefoundry.pem -g sg-60836f0b
$ knife ec2 server create -r 'role[tryit-ec2]' -I ami-3d4ff254 \
-x ubuntu -i $HOME/.ssh/KEY.pem -g SECURITY_GROUP


Repository Directories
Expand Down
4 changes: 2 additions & 2 deletions cookbooks/tryit-django/recipes/aws.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@

aws_elastic_lb "eip_load_balancer_production" do
only_if { node['roles'].include?("tryit-ec2") }
aws_access_key aws['aws_access_key_id']
aws_secret_access_key aws['aws_secret_access_key']
aws_access_key aws_data['aws_access_key_id']
aws_secret_access_key aws_data['aws_secret_access_key']
name "TryIT"
action :register
end
12 changes: 2 additions & 10 deletions cookbooks/tryit-django/recipes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

application "tryit-django" do

path ""
path "/srv/tryit-django"
owner "root"
group "root"
repository "https://github.com/chernando/tryit_django"
Expand All @@ -31,7 +31,7 @@
end

nginx_load_balancer do
application_server_role "tryit-worker"
application_server_role "tryit-ec2"
application_port 8080
end

Expand All @@ -41,11 +41,3 @@
link_type "symbolic"
to "/srv/tryit-django/shared/local_settings.py"
end

aws_elastic_lb "eip_load_balancer_production" do
only_if { node['roles'].include?("tryit-ec2") }
aws_access_key "KEY"
aws_secret_access_key "SECRET"
name "TryIT"
action :register
end
2 changes: 1 addition & 1 deletion roles/tryit-ec2.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
description "Gunicorn servers to run TryIT Blog (in AWS)"
run_list(
"recipe[tryit-django]",
"recipe[tryit-django:aws]"
"recipe[tryit-django::aws]"
)

0 comments on commit 524b51b

Please sign in to comment.