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: ef518abc0860
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: ad33e2ef18af
Choose a head ref
  • 2 commits
  • 6 files changed
  • 1 contributor

Commits on May 30, 2015

  1. custom dhparam

    @dwradcliffe
    dwradcliffe committed May 30, 2015
    Copy the full SHA
    7c313bb View commit details

  2. heroku directory

    @dwradcliffe
    dwradcliffe committed May 30, 2015
    Copy the full SHA
    ad33e2e View commit details
4 changes: 2 additions & 2 deletions Berksfile.lock
View file
Original file line number Diff line number Diff line change
@@ -253,7 +253,7 @@ GRAPH
rubygems-backups (0.0.21)
chef-vault (>= 0.0.0)
rubygems-ruby (>= 0.0.0)
rubygems-balancer (0.0.56)
rubygems-balancer (0.0.57)
chef-vault (>= 0.0.0)
datadog (>= 0.0.0)
logrotate (>= 0.0.0)
@@ -338,7 +338,7 @@ GRAPH
rubygems (>= 0.0.0)
sensu (= 2.1.0)
uchiwa (= 1.0.0)
rubygems-shipit (0.0.46)
rubygems-shipit (0.0.47)
apt (>= 0.0.0)
git (>= 0.0.0)
logrotate (>= 0.0.0)
2 changes: 1 addition & 1 deletion cookbooks/rubygems-balancer/metadata.rb
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name 'rubygems-balancer'

version '0.0.56'
version '0.0.57'

depends 'chef-vault'
depends 'datadog'
8 changes: 8 additions & 0 deletions cookbooks/rubygems-balancer/recipes/ssl.rb
View file
Original file line number Diff line number Diff line change
@@ -29,3 +29,11 @@
mode '0644'
notifies :reload, 'service[nginx]'
end

file "#{node['nginx']['dir']}/certs/dhparam.pem" do
content item['dhparam']
owner 'root'
group 'root'
mode '0644'
notifies :reload, 'service[nginx]'
end
1 change: 1 addition & 0 deletions cookbooks/rubygems-balancer/templates/default/site.conf.erb
View file
Original file line number Diff line number Diff line change
@@ -200,6 +200,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;

# 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.
2 changes: 1 addition & 1 deletion cookbooks/rubygems-shipit/metadata.rb
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name 'rubygems-shipit'

version '0.0.46'
version '0.0.47'

depends 'apt'
depends 'git'
1 change: 1 addition & 0 deletions cookbooks/rubygems-shipit/recipes/setup.rb
View file
Original file line number Diff line number Diff line change
@@ -23,6 +23,7 @@
[BUNDLE_PATH, '0775', 'deploy', 'users'],
[DATA_DIR, '0770', 'shipit', 'shipit'],
[LOG_DIR, '0755', 'shipit', 'shipit'],
["#{BASE_DIR}/.heroku", '0755', 'shipit', 'shipit'],
["#{SHARED_DIR}/public", '0755', 'shipit', 'shipit'],
["#{SHARED_DIR}/config", '0755', 'shipit', 'shipit'],
[ASSET_DIR, '0755', 'deploy', 'users'],