Skip to content
This repository has been archived by the owner on Nov 30, 2017. 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-aws
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e8ef6ed7868a
Choose a base ref
...
head repository: rubygems/rubygems-aws
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b24934d8f787
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on May 27, 2014

  1. Start using nginx from packagecloud

    Sam Kottler committed May 27, 2014
    Copy the full SHA
    fdb654b View commit details
  2. Bump the rubygems cookbook version

    Sam Kottler committed May 27, 2014
    Copy the full SHA
    ea186c4 View commit details
  3. Use the exact version of our custom nginx package

    Sam Kottler committed May 27, 2014
    Copy the full SHA
    b24934d View commit details
Showing with 5 additions and 5 deletions.
  1. +1 −1 chef/site-cookbooks/rubygems/metadata.rb
  2. +4 −4 chef/site-cookbooks/rubygems/recipes/nginx_source.rb
2 changes: 1 addition & 1 deletion chef/site-cookbooks/rubygems/metadata.rb
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
license 'MIT'
description 'RubyGems.org specific recipes'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '0.1.3'
version '0.1.5'

recipe 'rubygems', 'Default recipes for all nodes'
recipe 'rubygems::balancer', 'Nginx load balancer config'
8 changes: 4 additions & 4 deletions chef/site-cookbooks/rubygems/recipes/nginx_source.rb
Original file line number Diff line number Diff line change
@@ -3,11 +3,11 @@
# Recipe:: nginx_source.rb
#

package_name = "nginx_#{node['nginx']['version']}-#{node['nginx']['iteration']}_amd64.deb"
include_recipe "rubygems::packagecloud"

cookbook_file "#{Chef::Config[:file_cache_path]}/#{package_name}"

dpkg_package "#{Chef::Config[:file_cache_path]}/#{package_name}"
package "nginx" do
version "1.5.1-1"
end

# Continue to use upstream cookbooks
# for basic configuration and service management