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: a0554cba56cf
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: 13e4f3339d77
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Jul 16, 2014

  1. Get the fingerprint of the package signing GPG key from the key file …

    …on disk
    Sam Kottler committed Jul 16, 2014

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    8119434 View commit details
  2. Merge branch 'master' of github.com:rubygems/rubygems-infrastructure

    * 'master' of github.com:rubygems/rubygems-infrastructure:
      cleanup
      hide the rake tasks we aren’t using for now
      Reload on ulimit changes
      Metadata version bump
      Explicitly set the source
      Fix nginx's ulimit
      add client_max_body_size to balancer config
      add postfix to app server
      fix slack sensu handler
      add directory for use in maintenance mode
    Sam Kottler committed Jul 16, 2014

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    13e4f33 View commit details
Showing with 3 additions and 3 deletions.
  1. +1 −1 Berksfile.lock
  2. +1 −1 cookbooks/rubygems-apt/metadata.rb
  3. +1 −1 cookbooks/rubygems-apt/recipes/default.rb
2 changes: 1 addition & 1 deletion Berksfile.lock
Original file line number Diff line number Diff line change
@@ -202,7 +202,7 @@ GRAPH
runit (>= 0.0.0)
unicorn (>= 0.0.0)
user (>= 0.0.0)
rubygems-apt (0.0.12)
rubygems-apt (0.0.13)
apt (>= 0.0.0)
rubygems-backups (0.0.14)
chef-vault (>= 0.0.0)
2 changes: 1 addition & 1 deletion cookbooks/rubygems-apt/metadata.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name 'rubygems-apt'
maintainer 'RubyGems.org ops team'

version '0.0.12'
version '0.0.13'

depends 'apt'

2 changes: 1 addition & 1 deletion cookbooks/rubygems-apt/recipes/default.rb
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@

execute 'import-rubygems-apt-key' do
command '/usr/bin/apt-key add /etc/apt/rubygems/packages.key'
not_if "/usr/bin/apt-key list | grep '2048R/9EF9B1B7'"
not_if "/usr/bin/apt-key list | grep `sudo gpg --with-fingerprint /etc/apt/rubygems/packages.key | grep packages | awk '{ print $2 }'`"
end

apt_repository 'rubygems_main' do