Skip to content
This repository has been archived by the owner on Jul 11, 2020. It is now read-only.

Commit

Permalink
Search for app servers by role + env
Browse files Browse the repository at this point in the history
Sam Kottler committed Jun 25, 2014
1 parent b02db65 commit 4f5e21e
Showing 4 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Berksfile.lock
Original file line number Diff line number Diff line change
@@ -182,7 +182,7 @@ GRAPH
runit (>= 0.0.0)
unicorn (>= 0.0.0)
user (>= 0.0.0)
rubygems-balancer (0.0.10)
rubygems-balancer (0.0.12)
chef-vault (>= 0.0.0)
nginx (>= 0.0.0)
rubygems (>= 0.0.0)
2 changes: 1 addition & 1 deletion cookbooks/rubygems-balancer/metadata.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name 'rubygems-balancer'

version '0.0.10'
version '0.0.12'

depends 'chef-vault'
depends 'nginx'
2 changes: 1 addition & 1 deletion cookbooks/rubygems-balancer/recipes/site.rb
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
group 'root'
mode '0644'
variables(
app_servers: search(:node, "name:app01.#{node.chef_environment}.rubygems.org"),
app_servers: search(:node, "roles:app and environment:#{node.chef_environment}"),
stat_server: search(:node, 'roles:stat')[0],
server_names: ['rubygems.org', 'www.rubygems.org'],
ssl_key: File.join(node['nginx']['dir'], 'certs', 'rubygems.org.key'),
4 changes: 3 additions & 1 deletion cookbooks/rubygems-balancer/templates/default/site.conf.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
upstream app_servers {
server <%= @app_servers[0]['ipaddress'] %>:9000 fail_timeout=0;
<% @app_servers.each do |app_node| %>
server <%= app_node['ipaddress'] %>:9000 fail_timeout=0;
<% end %>
}

# HTTP

0 comments on commit 4f5e21e

Please sign in to comment.