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: 38d965da793e
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: 4ee72c50afee
Choose a head ref
  • 3 commits
  • 48 files changed
  • 2 contributors

Commits on Jan 12, 2014

  1. Switch to berkshelf

    Sam Kottler committed Jan 12, 2014
    Copy the full SHA
    94d911a View commit details

Commits on Jan 15, 2014

  1. Pin the berkshelf version to 2.0.x

    Sam Kottler committed Jan 15, 2014
    Copy the full SHA
    5a6e160 View commit details
  2. Merge pull request #154 from skottler/berks

    Switch to berkshelf
    dwradcliffe committed Jan 15, 2014
    Copy the full SHA
    4ee72c5 View commit details
Showing with 355 additions and 320 deletions.
  1. +2 −0 .gitignore
  2. +47 −0 Berksfile
  3. +198 −0 Berksfile.lock
  4. +0 −102 Cheffile
  5. +0 −208 Cheffile.lock
  6. +1 −1 Gemfile
  7. +107 −9 Gemfile.lock
  8. BIN vendor/cache/activesupport-3.2.16.gem
  9. BIN vendor/cache/akami-1.2.0.gem
  10. BIN vendor/cache/archive-tar-minitar-0.5.2.gem
  11. BIN vendor/cache/berkshelf-2.0.12.gem
  12. BIN vendor/cache/buff-config-0.4.0.gem
  13. BIN vendor/cache/buff-extensions-0.5.0.gem
  14. BIN vendor/cache/buff-ignore-1.1.1.gem
  15. BIN vendor/cache/buff-ruby_engine-0.1.0.gem
  16. BIN vendor/cache/buff-shell_out-0.1.1.gem
  17. BIN vendor/cache/builder-3.2.2.gem
  18. BIN vendor/cache/celluloid-0.14.1.gem
  19. BIN vendor/cache/celluloid-io-0.14.1.gem
  20. BIN vendor/cache/chozo-0.6.1.gem
  21. BIN vendor/cache/faraday-0.8.9.gem
  22. BIN vendor/cache/gssapi-1.0.3.gem
  23. BIN vendor/cache/gyoku-1.1.1.gem
  24. BIN vendor/cache/hashie-2.0.5.gem
  25. BIN vendor/cache/hitimes-1.2.1.gem
  26. BIN vendor/cache/httpclient-2.3.4.1.gem
  27. BIN vendor/cache/httpi-0.9.7.gem
  28. BIN vendor/cache/i18n-0.6.9.gem
  29. BIN vendor/cache/librarian-0.1.1.gem
  30. BIN vendor/cache/librarian-chef-0.0.2.gem
  31. BIN vendor/cache/little-plugger-1.1.3.gem
  32. BIN vendor/cache/logging-1.8.1.gem
  33. BIN vendor/cache/minitar-0.5.4.gem
  34. BIN vendor/cache/multipart-post-1.2.0.gem
  35. BIN vendor/cache/net-http-persistent-2.9.gem
  36. BIN vendor/cache/nio4r-0.5.0.gem
  37. BIN vendor/cache/nori-1.1.5.gem
  38. BIN vendor/cache/rack-1.5.2.gem
  39. BIN vendor/cache/rbzip2-0.2.0.gem
  40. BIN vendor/cache/retryable-1.3.4.gem
  41. BIN vendor/cache/ridley-1.5.3.gem
  42. BIN vendor/cache/rubyntlm-0.1.1.gem
  43. BIN vendor/cache/savon-0.9.5.gem
  44. BIN vendor/cache/solve-0.8.2.gem
  45. BIN vendor/cache/timers-2.0.0.gem
  46. BIN vendor/cache/varia_model-0.3.0.gem
  47. BIN vendor/cache/wasabi-1.0.0.gem
  48. BIN vendor/cache/winrm-1.1.3.gem
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -3,6 +3,8 @@ chef/cookbooks
cookbooks
tmp
.chef/knife.local.rb
.chef/*.pem
.bundle
chef.tar.gz
.rvmrc
chef/site-cookbooks/rubygems/files/default/rubygems.org*
47 changes: 47 additions & 0 deletions Berksfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
site :opscode

cookbook "application"
cookbook "application_ruby"
cookbook "apt", "1.9.0"
cookbook "aws"
cookbook "bash-completion"
cookbook "build-essential"
cookbook "curl"
cookbook "datadog"
cookbook "denyhosts", git: "https://github.com/phlipper/chef-denyhosts"
cookbook "elasticsearch", git: "https://github.com/elasticsearch/cookbook-elasticsearch"
cookbook "git"
cookbook "grc"
cookbook "hostname", "~> 0.1.0"
cookbook "htop"
cookbook "iftop"
cookbook "imagemagick"
cookbook "iptables", git: "https://github.com/phlipper/iptables"
cookbook "java"
cookbook "jenkins"
cookbook "logrotate"
cookbook "logwatch"
cookbook "memcached"
cookbook "monit", git: "https://github.com/phlipper/chef-monit"
cookbook "munin"
cookbook "newrelic-sysmond", "~> 1.3.0"
cookbook "nginx", git: "https://github.com/phlipper/chef-nginx"
cookbook "nodejs", git: "https://github.com/phlipper/chef-nodejs"
cookbook "ntp"
cookbook "openssh"
cookbook "papertrail-rsyslog"
cookbook "postfix"
cookbook "postgresql", git: "https://github.com/phlipper/chef-postgresql"
cookbook "rbenv", git: "https://github.com/fnichol/chef-rbenv"
cookbook "redis", git: "https://github.com/phlipper/chef-redis"
cookbook "resolver", '~> 1.1.4'
cookbook "rsync"
cookbook "ruby_build"
cookbook "screen"
cookbook "sudo"
cookbook "sysstat"
cookbook "user", git: "https://github.com/fnichol/chef-user"
cookbook "xfs"
cookbook "xml"
cookbook "xslt"
cookbook "zlib"
198 changes: 198 additions & 0 deletions Berksfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,198 @@
{
"sources": {
"application": {
"locked_version": "4.1.4"
},
"application_ruby": {
"locked_version": "3.0.2"
},
"apt": {
"locked_version": "1.9.0"
},
"aws": {
"locked_version": "1.0.0"
},
"bash-completion": {
"locked_version": "0.1.0"
},
"build-essential": {
"locked_version": "1.4.2"
},
"curl": {
"locked_version": "1.1.0"
},
"datadog": {
"locked_version": "1.1.1"
},
"denyhosts": {
"locked_version": "1.4.0",
"git": "https://github.com/phlipper/chef-denyhosts",
"ref": "d59b385c677a60b692b69b9b2b5fcc3ee79d7464"
},
"elasticsearch": {
"locked_version": "0.3.7",
"git": "https://github.com/elasticsearch/cookbook-elasticsearch",
"ref": "e89d3ef6762847f4088dbbfc9b439a7274265399"
},
"git": {
"locked_version": "2.9.0"
},
"grc": {
"locked_version": "1.0.0"
},
"hostname": {
"locked_version": "0.1.0"
},
"htop": {
"locked_version": "1.2.0"
},
"iftop": {
"locked_version": "0.0.1"
},
"imagemagick": {
"locked_version": "0.2.2"
},
"iptables": {
"locked_version": "0.11.0",
"git": "https://github.com/phlipper/iptables",
"ref": "72d5e7f919cce4df43ea90173c381e70e74f3aeb"
},
"java": {
"locked_version": "1.17.6"
},
"jenkins": {
"locked_version": "1.2.2"
},
"logrotate": {
"locked_version": "1.4.0"
},
"logwatch": {
"locked_version": "1.1.0"
},
"memcached": {
"locked_version": "1.7.0"
},
"monit": {
"locked_version": "1.5.1",
"git": "https://github.com/phlipper/chef-monit",
"ref": "b74f4fde2e2bd4db13afdacc64f39b8a8d43eb00"
},
"munin": {
"locked_version": "1.4.0"
},
"newrelic-sysmond": {
"locked_version": "1.3.3"
},
"nginx": {
"locked_version": "0.5.5",
"git": "https://github.com/phlipper/chef-nginx",
"ref": "4cdb7fe095f0a855d933e9629992a05332c91ccb"
},
"nodejs": {
"locked_version": "1.7.0",
"git": "https://github.com/phlipper/chef-nodejs",
"ref": "0f8cfce359c8b900eba2c7926f608d9477cc19aa"
},
"ntp": {
"locked_version": "1.5.4"
},
"openssh": {
"locked_version": "1.3.2"
},
"papertrail-rsyslog": {
"locked_version": "1.1.1"
},
"postfix": {
"locked_version": "3.0.4"
},
"postgresql": {
"locked_version": "0.13.0",
"git": "https://github.com/phlipper/chef-postgresql",
"ref": "2c412e2f1aebce50d84fe13a3d9c6c544004fad6"
},
"rbenv": {
"locked_version": "0.7.3",
"git": "https://github.com/fnichol/chef-rbenv",
"ref": "9afb4e5da2e6212504a12de3bbbd410cd96100f6"
},
"redis": {
"locked_version": "0.5.2",
"git": "https://github.com/phlipper/chef-redis",
"ref": "926db40eefd00654aaf1b4b0e2522b413042720d"
},
"resolver": {
"locked_version": "1.1.4"
},
"rsync": {
"locked_version": "0.8.4"
},
"ruby_build": {
"locked_version": "0.8.0"
},
"screen": {
"locked_version": "0.8.0"
},
"sudo": {
"locked_version": "2.3.0"
},
"sysstat": {
"locked_version": "1.2.0"
},
"user": {
"locked_version": "0.3.1",
"git": "https://github.com/fnichol/chef-user",
"ref": "ce45d05e13491a82cbb5a2c36292391f3a1aaa36"
},
"xfs": {
"locked_version": "1.1.0"
},
"xml": {
"locked_version": "1.2.0"
},
"xslt": {
"locked_version": "0.0.1"
},
"zlib": {
"locked_version": "2.0.0"
},
"unicorn": {
"locked_version": "1.3.0"
},
"apache2": {
"locked_version": "1.8.14"
},
"passenger_apache2": {
"locked_version": "2.1.2"
},
"runit": {
"locked_version": "1.5.8"
},
"yum": {
"locked_version": "3.0.4"
},
"yum-epel": {
"locked_version": "0.2.0"
},
"chef_handler": {
"locked_version": "1.1.4"
},
"ark": {
"locked_version": "0.4.2"
},
"dmg": {
"locked_version": "2.1.2"
},
"windows": {
"locked_version": "1.12.6"
},
"hostsfile": {
"locked_version": "2.4.2"
},
"perl": {
"locked_version": "1.2.2"
},
"rsyslog": {
"locked_version": "1.5.0"
}
}
}
102 changes: 0 additions & 102 deletions Cheffile

This file was deleted.

Loading