diff --git a/Berksfile b/Berksfile index 85f7ac6c..be55a5cf 100644 --- a/Berksfile +++ b/Berksfile @@ -8,7 +8,6 @@ pantry_cookbook 'backups' pantry_cookbook 'bluepill' pantry_cookbook 'boost' pantry_cookbook 'build-essential' -pantry_cookbook 'cassandra' pantry_cookbook 'chef-client' pantry_cookbook 'chef-server' pantry_cookbook 'cloud_utils' @@ -20,8 +19,6 @@ pantry_cookbook 'elasticsearch' pantry_cookbook 'emacs' pantry_cookbook 'erlang' pantry_cookbook 'firewall' -pantry_cookbook 'flume' -pantry_cookbook 'ganglia' pantry_cookbook 'gecode' pantry_cookbook 'git' pantry_cookbook 'graphite' @@ -48,7 +45,6 @@ pantry_cookbook 'nfs' pantry_cookbook 'nginx' pantry_cookbook 'nodejs' pantry_cookbook 'ntp' -pantry_cookbook 'openssh' pantry_cookbook 'openssl' pantry_cookbook 'package_set' pantry_cookbook 'pig' @@ -56,14 +52,11 @@ pantry_cookbook 'postgresql' pantry_cookbook 'python' pantry_cookbook 'rabbitmq' pantry_cookbook 'redis' -pantry_cookbook 'resque' pantry_cookbook 'route53' -pantry_cookbook 'rstats' pantry_cookbook 'runit' pantry_cookbook 'rvm' pantry_cookbook 'silverware' pantry_cookbook 'snappy' -pantry_cookbook 'statsd' pantry_cookbook 'strongswan' pantry_cookbook 'sudo' pantry_cookbook 'thrift' diff --git a/config/Berksfile.inc.rb b/config/Berksfile.inc.rb index ec9e8a82..5484d88c 100644 --- a/config/Berksfile.inc.rb +++ b/config/Berksfile.inc.rb @@ -17,6 +17,8 @@ ENV['LOCAL_PATH'] = "vendor" unless ENV['LOCAL_PATH'] ENV['PANTRY_REPO'] = 'infochimps-labs/ironfan-pantry' unless ENV['PANTRY_REPO'] ENV['PANTRY_BRANCH'] = 'master' unless ENV['PANTRY_BRANCH'] +ENV['COMMUNITY_REPO'] = 'infochimps-labs/community-pantry' unless ENV['COMMUNITY_REPO'] +ENV['COMMUNITY_BRANCH'] = 'master' unless ENV['COMMUNITY_BRANCH'] def github_cookbook(name, repo, rel, branch) if ! ENV['USE_LOCAL'].nil? @@ -31,6 +33,10 @@ def pantry_cookbook(name) github_cookbook name, ENV['PANTRY_REPO'], ('cookbooks/' + name), ENV['PANTRY_BRANCH'] end +def community_cookbook(name) + github_cookbook name, ENV['COMMUNITY_REPO'], ('cookbooks/' + name), ENV['COMMUNITY_BRANCH'] +end + def org_cookbook(name) cookbook name, path: "org_cookbooks/#{name}" end \ No newline at end of file