Skip to content
This repository was 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: b4935647221e
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: 320fbd094d3f
Choose a head ref
  • 2 commits
  • 5 files changed
  • 1 contributor

Commits on Aug 13, 2014

  1. fix ntp cookbook bug

    dwradcliffe committed Aug 13, 2014

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    vdemeester Vincent Demeester
    Copy the full SHA
    ca5af00 View commit details
  2. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    320fbd0 View commit details
4 changes: 2 additions & 2 deletions Berksfile.lock
Original file line number Diff line number Diff line change
@@ -223,7 +223,7 @@ GRAPH
rubygems-cache (0.0.1)
memcached (>= 0.0.0)
rubygems (>= 0.0.0)
rubygems-chef (0.0.24)
rubygems-chef (0.0.25)
chef-client (>= 0.0.0)
chef-vault (>= 0.0.0)
omnibus_updater (>= 0.0.0)
@@ -264,7 +264,7 @@ GRAPH
rubygems-sensu (>= 0.0.0)
rubygems-motd (0.0.7)
motd (>= 0.0.0)
rubygems-ntp (0.0.1)
rubygems-ntp (0.0.2)
ntp (>= 0.0.0)
rubygems-people (0.0.28)
sudo (>= 0.0.0)
2 changes: 1 addition & 1 deletion cookbooks/rubygems-chef/metadata.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name 'rubygems-chef'
maintainer 'RubyGems.org ops team'

version '0.0.24'
version '0.0.25'

depends 'chef-client'
depends 'chef-vault'
4 changes: 0 additions & 4 deletions cookbooks/rubygems-chef/recipes/default.rb
Original file line number Diff line number Diff line change
@@ -6,10 +6,6 @@
include_recipe 'rubygems-chef::librato'
include_recipe 'rubygems-chef::slack'

cron 'chef-client' do
action :delete
end

node.default['chef_client']['config']['ssl_verify_mode'] = ':verify_peer'
node.default['chef_client']['config']['client_fork'] = true

2 changes: 1 addition & 1 deletion cookbooks/rubygems-ntp/metadata.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name 'rubygems-ntp'

version '0.0.1'
version '0.0.2'

depends 'ntp'
4 changes: 4 additions & 0 deletions cookbooks/rubygems-ntp/recipes/default.rb
Original file line number Diff line number Diff line change
@@ -3,4 +3,8 @@
# Recipe:: default
#

# Force this, because something else is changing it and the ntp cookbook relies on it
# https://github.com/gmiranda23/ntp/blob/582353887f7ce5ad716916edcf8568be23619ae4/templates/default/ntp.conf.erb#L6
node.set['virtualization']['role'] = 'guest'

include_recipe 'ntp'