rubygems · Oct 23, 2015 · Oct 23, 2015 · Oct 23, 2015
diff --git a/Berksfile.lock b/Berksfile.lock
@@ -219,7 +219,7 @@ GRAPH
     rubygems-sensu (>= 0.0.0)
     rubygems-ssh (>= 0.0.0)
     rubygems-utility (>= 0.0.0)
-  rubygems-app (0.0.59)
+  rubygems-app (0.0.61)
     apt (>= 0.0.0)
     chef-vault (>= 0.0.0)
     datadog (>= 0.0.0)
@@ -244,7 +244,7 @@ GRAPH
   rubygems-backups (0.0.24)
     chef-vault (>= 0.0.0)
     rubygems-ruby (>= 0.0.0)
-  rubygems-balancer (0.0.69)
+  rubygems-balancer (0.0.70)
     chef-vault (>= 0.0.0)
     datadog (>= 0.0.0)
     logrotate (>= 0.0.0)

diff --git a/cookbooks/rubygems-app/metadata.rb b/cookbooks/rubygems-app/metadata.rb
@@ -1,6 +1,6 @@
 name 'rubygems-app'
 
-version '0.0.59'
+version '0.0.61'
 
 depends 'apt'
 depends 'chef-vault'

diff --git a/cookbooks/rubygems-app/recipes/config.rb b/cookbooks/rubygems-app/recipes/config.rb
@@ -10,6 +10,9 @@
 secrets = chef_vault_item('rubygems', node.chef_environment)
 db_host = search(:node, "name:#{dbhost}.#{node.chef_environment}.rubygems.org")[0]
 
+redis_host = data_bag_item('hosts', 'redis')['environments'][node.chef_environment]
+redis_ip = search('node', "name:#{redis_host}.#{node.chef_environment}.rubygems.org")[0]['ipaddress']
+
 template '/applications/rubygems/shared/config/database.yml' do
   source 'database.yml.erb'
   owner 'deploy'
@@ -44,6 +47,8 @@
     fastly_api_key: secrets['fastly_api_key'],
     fastly_service_id: secrets['fastly_service_id'],
     fastly_domain: "#{fastly_domain}.global.ssl.fastly.net",
+    elasticsearch_url: secrets['elasticsearch_url'],
+    redis_url: "redis://#{redis_ip}:6379/0",
     honeybadger_api_key: secrets['honeybadger_api_key']
   )
 end
diff --git a/cookbooks/rubygems-app/recipes/delayed_job.rb b/cookbooks/rubygems-app/recipes/delayed_job.rb
@@ -3,16 +3,12 @@
 # Recipe:: delayed_job
 #
 
-redis_host = data_bag_item('hosts', 'redis')['environments'][node.chef_environment]
-redis_ip = search('node', "name:#{redis_host}.#{node.chef_environment}.rubygems.org")[0]['ipaddress']
-
 runit_service 'delayed_job' do
   owner 'deploy'
   group 'deploy'
   default_logger true
   env(
-    'RAILS_ENV' => node.chef_environment,
-    'REDISTOGO_URL' => "redis://#{redis_ip}:6379/0"
+    'RAILS_ENV' => node.chef_environment
   )
   options(
     owner: 'deploy',

diff --git a/cookbooks/rubygems-app/recipes/unicorn.rb b/cookbooks/rubygems-app/recipes/unicorn.rb
@@ -10,9 +10,6 @@
   before_fork 'sleep 1'
 end
 
-redis_host = data_bag_item('hosts', 'redis')['environments'][node.chef_environment]
-redis_ip = search('node', "name:#{redis_host}.#{node.chef_environment}.rubygems.org")[0]['ipaddress']
-
 include_recipe 'chef-vault'
 
 runit_service 'unicorn' do
@@ -21,7 +18,6 @@
   default_logger true
   env(
     'RAILS_ENV' => node.chef_environment,
-    'REDISTOGO_URL' => "redis://#{redis_ip}:6379/0",
     'STATSD_IMPLEMENTATION' => 'datadog'
   )
   options(

diff --git a/cookbooks/rubygems-app/templates/default/secret.rb.erb b/cookbooks/rubygems-app/templates/default/secret.rb.erb
@@ -9,3 +9,6 @@ ENV['HONEYBADGER_API_KEY'] = "<%= @honeybadger_api_key %>"
 ENV['FASTLY_API_KEY'] = "<%= @fastly_api_key %>"
 ENV['FASTLY_SERVICE_ID'] = "<%= @fastly_service_id %>"
 ENV['FASTLY_DOMAIN'] = "<%= @fastly_domain %>"
+ENV['ELASTICSEARCH_URL'] = '<%= @elasticsearch_url %>'
+ENV['REDISTOGO_URL'] = '<%= @redis_url %>'
+ENV['REDIS_URL'] = '<%= @redis_url %>'
diff --git a/cookbooks/rubygems-balancer/metadata.rb b/cookbooks/rubygems-balancer/metadata.rb
@@ -1,6 +1,6 @@
 name 'rubygems-balancer'
 
-version '0.0.69'
+version '0.0.70'
 
 depends 'chef-vault'
 depends 'datadog'

diff --git a/cookbooks/rubygems-balancer/templates/default/site.conf.erb b/cookbooks/rubygems-balancer/templates/default/site.conf.erb
@@ -172,7 +172,7 @@ server {
   ssl_protocols               TLSv1 TLSv1.1 TLSv1.2;
   ssl_ciphers                 ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA;
   ssl_prefer_server_ciphers   on;
-  # ssl_dhparam                 <%= node['nginx']['dir'] %>/certs/dhparam.pem;
+  ssl_dhparam                 <%= node['nginx']['dir'] %>/certs/dhparam.pem;
 
   # There are bugs in Net::HTTP::Persisent + OpenSSL in 1.8 are uncovered by
   # trying to use a session cache. If we switch it off, they go away.