add Fastly secrets

rubygems · Aug 3, 2015 · bf97b0b · bf97b0b
1 parent 0df840d
commit bf97b0b
Showing 4 changed files with 10 additions and 2 deletions.
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.54)
+  rubygems-app (0.0.56)
     apt (>= 0.0.0)
     chef-vault (>= 0.0.0)
     datadog (>= 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.54'
+version '0.0.56'
 
 depends 'apt'
 depends 'chef-vault'

diff --git a/cookbooks/rubygems-app/recipes/config.rb b/cookbooks/rubygems-app/recipes/config.rb
@@ -25,6 +25,8 @@
   )
 end
 
+fastly_domain = node.chef_environment == 'production' ? 'rubygems' : 'rubygems-staging'
+
 template '/applications/rubygems/shared/config/secret.rb' do
   source 'secret.rb.erb'
   owner  'deploy'
@@ -39,6 +41,9 @@
     bundler_api_url: secrets['bundler_api_url'],
     new_relic_license_key: secrets['new_relic_license_key'],
     new_relic_app_name: "RubyGems.org (#{node.chef_environment})",
+    fastly_api_key: secrets['fastly_api_key'],
+    fastly_service_id: secrets['fastly_service_id'],
+    fastly_domain: "#{fastly_domain}.global.ssl.fastly.net",
     honeybadger_api_key: secrets['honeybadger_api_key']
   )
 end
diff --git a/cookbooks/rubygems-app/templates/default/secret.rb.erb b/cookbooks/rubygems-app/templates/default/secret.rb.erb
@@ -6,3 +6,6 @@ ENV['BUNDLER_API_URL'] = "<%= @bundler_api_url %>"
 ENV['NEW_RELIC_LICENSE_KEY'] = "<%= @new_relic_license_key %>"
 ENV['NEW_RELIC_APP_NAME'] = "<%= @new_relic_app_name %>"
 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 %>"