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: d467c3347f99
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: 2f1831bb46e3
Choose a head ref
  • 3 commits
  • 15 files changed
  • 1 contributor

Commits on Feb 8, 2015

  1. datadog

    dwradcliffe committed Feb 8, 2015
    Copy the full SHA
    3fd04fa View commit details
  2. fix chef cookbook

    dwradcliffe committed Feb 8, 2015
    Copy the full SHA
    c981e35 View commit details
  3. Copy the full SHA
    2f1831b View commit details
12 changes: 6 additions & 6 deletions Berksfile.lock
Original file line number Diff line number Diff line change
@@ -226,7 +226,7 @@ GRAPH
rubygems-sensu (>= 0.0.0)
rubygems-ssh (>= 0.0.0)
rubygems-utility (>= 0.0.0)
rubygems-app (0.0.41)
rubygems-app (0.0.42)
apt (>= 0.0.0)
chef-vault (>= 0.0.0)
git (>= 0.0.0)
@@ -243,7 +243,7 @@ GRAPH
rubygems-backups (0.0.20)
chef-vault (>= 0.0.0)
rubygems-ruby (>= 0.0.0)
rubygems-balancer (0.0.41)
rubygems-balancer (0.0.42)
chef-vault (>= 0.0.0)
logrotate (>= 0.0.0)
nginx (>= 0.0.0)
@@ -258,7 +258,7 @@ GRAPH
memcached (>= 0.0.0)
rubygems (>= 0.0.0)
rubygems-sensu (>= 0.0.0)
rubygems-chef (0.0.36)
rubygems-chef (0.0.37)
chef-client (>= 0.0.0)
chef-vault (>= 0.0.0)
omnibus_updater (>= 0.0.0)
@@ -286,7 +286,7 @@ GRAPH
dns (>= 0.0.0)
hostname (>= 0.0.0)
rubygems-hosts (0.0.10)
rubygems-hubot (0.0.60)
rubygems-hubot (0.0.64)
chef-vault (>= 0.0.0)
hubot (~> 1.0.2)
nginx (>= 0.0.0)
@@ -297,7 +297,7 @@ GRAPH
rubygems-logging (0.0.6)
chef-vault (>= 0.0.0)
rsyslog (>= 0.0.0)
rubygems-metrics (0.1.1)
rubygems-metrics (0.1.5)
chef-vault (>= 0.0.0)
collectd (>= 0.0.0)
collectd-librato (>= 0.0.0)
@@ -317,7 +317,7 @@ GRAPH
rubygems-people (0.0.34)
sudo (>= 0.0.0)
user (>= 0.0.0)
rubygems-redis (0.1.6)
rubygems-redis (0.1.7)
aws (>= 0.0.0)
redisio (>= 0.0.0)
rubygems (>= 0.0.0)
2 changes: 1 addition & 1 deletion cookbooks/rubygems-app/metadata.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name 'rubygems-app'

version '0.0.41'
version '0.0.42'

depends 'apt'
depends 'chef-vault'
1 change: 1 addition & 0 deletions cookbooks/rubygems-app/recipes/unicorn.rb
Original file line number Diff line number Diff line change
@@ -23,6 +23,7 @@
env(
'RAILS_ENV' => node.chef_environment,
'REDISTOGO_URL' => "redis://#{redis_ip}:6379/0",
'STATSD_IMPLEMENTATION' => 'datadog',
'LIBRATO_USER' => librato_creds['email'],
'LIBRATO_TOKEN' => librato_creds['token'],
'LIBRATO_PREFIX' => "app.#{node.chef_environment}"
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.41'
version '0.0.42'

depends 'chef-vault'
depends 'logrotate'
2 changes: 2 additions & 0 deletions cookbooks/rubygems-balancer/recipes/default.rb
Original file line number Diff line number Diff line change
@@ -23,3 +23,5 @@
source 'nginx'
notifies :reload, 'service[nginx]'
end

include_recipe 'rubygems-metrics::nginx'
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.36'
version '0.0.37'

depends 'chef-client'
depends 'chef-vault'
8 changes: 8 additions & 0 deletions cookbooks/rubygems-chef/recipes/default.rb
Original file line number Diff line number Diff line change
@@ -13,6 +13,14 @@
node.default['chef_client']['cron']['hour'] = '*'

include_recipe 'chef-client::config'

# See: https://github.com/opscode-cookbooks/chef-client/issues/196
if node.name == 'chef.common.rubygems.org'
r = resources(template: '/etc/chef/client.rb')
r.user 'root'
r.group 'root'
end

include_recipe 'chef-client::cron'

service 'chef-client' do
8 changes: 7 additions & 1 deletion cookbooks/rubygems-hubot/files/default/scripts/deploy.coffee
Original file line number Diff line number Diff line change
@@ -62,7 +62,13 @@ deploy = (msg, env, branch) ->
else
exec "git checkout master", "#{process.env["HUBOT_DEPLOY_LOG_DIR"]}/#{deployKey}.log", callback
(callback) ->
exec "bundle check || bundle install --local --without production", "#{process.env["HUBOT_DEPLOY_LOG_DIR"]}/#{deployKey}.log", callback
if branch
exec "git pull --force origin #{branch}", "#{process.env["HUBOT_DEPLOY_LOG_DIR"]}/#{deployKey}.log", callback
else
exec "git pull --force origin master", "#{process.env["HUBOT_DEPLOY_LOG_DIR"]}/#{deployKey}.log", callback
(callback) ->
localFlag = if env is 'staging' then '' else '--local'
exec "bundle check || bundle install #{localFlag} --without production", "#{process.env["HUBOT_DEPLOY_LOG_DIR"]}/#{deployKey}.log", callback
(callback) ->
branchCmd = if branch then "BRANCH=#{branch}" else ''
cleanCmd = if 'staging' == env then 'deploy:clean_git_cache' else ''
2 changes: 1 addition & 1 deletion cookbooks/rubygems-hubot/metadata.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name 'rubygems-hubot'

version '0.0.60'
version '0.0.64'

depends 'chef-vault'
depends 'hubot', '~> 1.0.2'
2 changes: 1 addition & 1 deletion cookbooks/rubygems-metrics/metadata.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name 'rubygems-metrics'
maintainer 'RubyGems.org ops team'

version '0.1.1'
version '0.1.5'

depends 'chef-vault'
depends 'collectd'
13 changes: 13 additions & 0 deletions cookbooks/rubygems-metrics/recipes/nginx.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#
# Cookbook Name:: rubygems-metrics
# Recipe:: nginx
#

node.default['datadog']['nginx']['instances'] = [
{
'nginx_status_url' => 'http://localhost/nginx_status/',
'tags' => []
}
]

include_recipe 'datadog::nginx'
11 changes: 11 additions & 0 deletions cookbooks/rubygems-metrics/recipes/postgresql.rb
Original file line number Diff line number Diff line change
@@ -16,3 +16,14 @@
)
notifies :restart, 'service[collectd]'
end

node.default['datadog']['postgres']['instances'] = [
{
'server' => 'localhost',
'username' => 'postgres',
'password' => db_host['postgresql']['password']['postgres'],
'tags' => []
}
]

include_recipe 'datadog::postgres'
13 changes: 13 additions & 0 deletions cookbooks/rubygems-metrics/recipes/redis.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#
# Cookbook Name:: rubygems-metrics
# Recipe:: redis
#

node.default['datadog']['redisdb']['instances'] = [
{
'server' => 'localhost',
'tags' => []
}
]

include_recipe 'datadog::redisdb'
2 changes: 1 addition & 1 deletion cookbooks/rubygems-redis/metadata.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name 'rubygems-redis'
maintainer 'RubyGems.org ops team'

version '0.1.6'
version '0.1.7'

depends 'aws'
depends 'redisio'
1 change: 1 addition & 0 deletions cookbooks/rubygems-redis/recipes/default.rb
Original file line number Diff line number Diff line change
@@ -16,3 +16,4 @@
include_recipe 'redisio::enable'

include_recipe 'rubygems-backups::redis'
include_recipe 'rubygems-metrics::redis'