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: beefe3d52b06
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: 4f7d40c0bd2a
Choose a head ref
  • 2 commits
  • 4 files changed
  • 1 contributor

Commits on Jun 18, 2014

  1. Copy the full SHA
    3feac12 View commit details
  2. Fix conflict in Berksfile.lock

    Sam Kottler committed Jun 18, 2014
    Copy the full SHA
    4f7d40c View commit details
Showing with 20 additions and 15 deletions.
  1. +1 −1 Berksfile
  2. +7 −7 Berksfile.lock
  3. +2 −2 cookbooks/rubygems-notify/metadata.rb
  4. +10 −5 cookbooks/rubygems-notify/recipes/default.rb
2 changes: 1 addition & 1 deletion Berksfile
Original file line number Diff line number Diff line change
@@ -32,4 +32,4 @@ cookbook 'collectd', git: 'git@github.com:librato/collectd-cookbook.git'
cookbook 'collectd-librato', git: 'git@github.com:librato/collectd-librato-cookbook.git'
cookbook 'dwradcliffe-dnsimple', git: 'git@github.com:dwradcliffe/chef-dnsimple.git', branch: 'rubygems'
cookbook 'duo-security', git: 'git@github.com:skottler/chef-duo-security'
cookbook 'irc_handler', git: 'git@github.com:bflad/chef-irc_handler.git'
cookbook 'slack_handler', git: 'git@github.com:dcm-ops/chef-slack_handler.git'
14 changes: 7 additions & 7 deletions Berksfile.lock
Original file line number Diff line number Diff line change
@@ -16,9 +16,6 @@ DEPENDENCIES
git: git@github.com:dwradcliffe/chef-dnsimple.git
revision: 7eda69eb9999e03c45a7772068d23e4275b7d946
branch: rubygems
irc_handler
git: git@github.com:bflad/chef-irc_handler.git
revision: c2b7e3616daf3d47818b12034dc9ad8b51aaafc2
rubygems
path: cookbooks/rubygems
rubygems-app
@@ -57,6 +54,9 @@ DEPENDENCIES
path: cookbooks/rubygems-ssh
rubygems-utility
path: cookbooks/rubygems-utility
slack_handler
git: git@github.com:dcm-ops/chef-slack_handler.git
revision: af6f9aa94c305713bb7fc341bf1eda761b7ddd2e

GRAPH
apache2 (1.10.4)
@@ -100,8 +100,6 @@ GRAPH
hostsfile (>= 0.0.0)
hostsfile (2.4.4)
iptables (0.13.2)
irc_handler (0.1.3)
chef_handler (>= 0.0.0)
line (0.5.1)
logrotate (1.6.0)
memcached (1.7.2)
@@ -180,8 +178,8 @@ GRAPH
rubygems-sensu (>= 0.0.0)
rubygems-motd (0.0.7)
motd (>= 0.0.0)
rubygems-notify (0.0.1)
irc_handler (>= 0.0.0)
rubygems-notify (0.0.2)
slack_handler (>= 0.0.0)
rubygems-ntp (0.0.1)
ntp (>= 0.0.0)
rubygems-people (0.0.11)
@@ -209,6 +207,8 @@ GRAPH
redisio (>= 1.7.0)
windows (>= 1.8.8)
yum (>= 0.0.0)
slack_handler (0.0.1)
chef_handler (>= 0.0.0)
sudo (2.6.0)
ulimit (0.3.2)
unicorn (1.3.0)
4 changes: 2 additions & 2 deletions cookbooks/rubygems-notify/metadata.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name 'rubygems-notify'
maintainer 'RubyGems.org ops team'

version '0.0.1'
version '0.0.2'

depends 'irc_handler'
depends 'slack_handler'

supports 'ubuntu'
15 changes: 10 additions & 5 deletions cookbooks/rubygems-notify/recipes/default.rb
Original file line number Diff line number Diff line change
@@ -3,9 +3,14 @@
# Recipe:: default
#

node.default['chef_client']['handler']['irc']['channel'] = '#rubygems-aws'
node.default['chef_client']['handler']['irc']['hostname'] = 'irc.freenode.net'
node.default['chef_client']['handler']['irc']['join'] = true
node.default['chef_client']['handler']['irc']['nick'] = 'rubygems-chef'
include_recipe 'chef-vault'

include_recipe 'irc_handler'
slack_creds = ChefVault::Item.load('slack', 'credentials')

node.default['chef_client']['handler']['slack']['team'] = slack_creds['team']
node.default['chef_client']['handler']['slack']['api_key'] = slack_creds['api_key']
node.default['chef_client']['handler']['slack']['channel'] = slack_creds['channel']
node.default['chef_client']['handler']['slack']['username'] = slack_creds['username']
node.default['chef_client']['handler']['slack']['icon_url'] = slack_creds['icon_url']

include_recipe 'slack_handler'