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

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rubygems/rubygems-chef
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6f8515da1e62
Choose a base ref
...
head repository: rubygems/rubygems-chef
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 401d9fb1a3ff
Choose a head ref
  • 3 commits
  • 4 files changed
  • 1 contributor

Commits on Aug 25, 2015

  1. cleanup

    dwradcliffe committed Aug 25, 2015
    Copy the full SHA
    7474e09 View commit details
  2. Copy the full SHA
    721524a View commit details
  3. push new lb cookbook

    dwradcliffe committed Aug 25, 2015
    Copy the full SHA
    401d9fb View commit details
2 changes: 1 addition & 1 deletion Berksfile.lock
Original file line number Diff line number Diff line change
@@ -244,7 +244,7 @@ GRAPH
rubygems-backups (0.0.24)
chef-vault (>= 0.0.0)
rubygems-ruby (>= 0.0.0)
rubygems-balancer (0.0.68)
rubygems-balancer (0.0.69)
chef-vault (>= 0.0.0)
datadog (>= 0.0.0)
logrotate (>= 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.68'
version '0.0.69'

depends 'chef-vault'
depends 'datadog'
1 change: 1 addition & 0 deletions cookbooks/rubygems-balancer/recipes/logging.rb
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@

log_fields = {
'host' => node.name,
'timestamp' => '$time_iso8601',
'status' => '$status',
'scheme' => '$scheme',
'uri' => '$request_uri',
8 changes: 4 additions & 4 deletions cookbooks/rubygems-balancer/templates/default/site.conf.erb
Original file line number Diff line number Diff line change
@@ -42,7 +42,7 @@ server {
include <%= node['nginx']['dir'] %>/blacklist.conf; # not managed by chef

location ~ /rubygems/rubygems(.*)\.(tgz|zip|gem)$ {
rewrite ^ http://rubygems.global.ssl.fastly.net$request_uri redirect;
rewrite ^ <%= @gem_mirror %>$request_uri redirect;
}

location ~ /gems/(.*)\.gem$ {
@@ -191,11 +191,9 @@ server {
include <%= node['nginx']['dir'] %>/blacklist.conf; # not managed by chef

location ~ /rubygems/rubygems(.*)\.(tgz|zip|gem)$ {
rewrite ^ https://rubygems.global.ssl.fastly.net$request_uri redirect;
rewrite ^ <%= @gem_mirror_ssl %>$request_uri redirect;
}

##### BEGIN legacy rules

location = /__log {
internal;
proxy_pass http://127.0.0.1:5000/gems/$gem.gem;
@@ -217,6 +215,8 @@ server {
proxy_pass http://bundler.rubygems.org;
}

##### BEGIN legacy rules

location /quick/Marshal.4.8/ {
rewrite ^ <%= @gem_mirror_ssl %>$request_uri redirect;
}