Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Updating for Chef 0.8 changes.

* Use 'default.rb' for attributes files when specific files not
  necessary
* Update search in rsyslog recipe.
  • Loading branch information...
commit ef7e6a178499287cab2f5ba3d09b1bcd06e2ec1f 1 parent 24f6358
@jtimberman jtimberman authored
Showing with 49 additions and 46 deletions.
  1. +2 −1  NOTICE
  2. 0  activemq/attributes/{activemq.rb → default.rb}
  3. +1 −1  activemq/metadata.rb
  4. 0  apache2/attributes/{apache.rb → default.rb}
  5. +1 −1  apache2/metadata.rb
  6. 0  bootstrap/attributes/{bootstrap.rb → default.rb}
  7. +1 −1  bootstrap/metadata.rb
  8. 0  chef/attributes/{chef.rb → default.rb}
  9. +1 −1  chef/metadata.rb
  10. 0  couchdb/attributes/{couchdb.rb → default.rb}
  11. +1 −1  couchdb/metadata.rb
  12. 0  djbdns/attributes/{djbdns.rb → default.rb}
  13. +1 −1  djbdns/metadata.rb
  14. 0  dynomite/attributes/{dynomite.rb → default.rb}
  15. +1 −1  dynomite/metadata.rb
  16. 0  erlang/attributes/{erlang.rb → default.rb}
  17. +2 −2 erlang/metadata.rb
  18. +0 −1  erlang/recipes/default.rb
  19. +1 −1  gems/metadata.rb
  20. 0  glassfish/attributes/{glassfish.rb → default.rb}
  21. +1 −1  glassfish/metadata.rb
  22. 0  jira/attributes/{jira.rb → default.rb}
  23. +1 −1  jira/metadata.rb
  24. 0  kickstart/attributes/{kickstart.rb → default.rb}
  25. +2 −2 kickstart/metadata.rb
  26. 0  maradns/attributes/{maradns.rb → default.rb}
  27. +1 −1  maradns/metadata.rb
  28. 0  memcached/attributes/{memcached.rb → default.rb}
  29. +1 −1  memcached/metadata.rb
  30. 0  nginx/attributes/{nginx.rb → default.rb}
  31. +1 −1  nginx/metadata.rb
  32. 0  ntp/attributes/{ntp.rb → default.rb}
  33. +1 −1  ntp/metadata.rb
  34. 0  openldap/attributes/{openldap.rb → default.rb}
  35. +1 −1  openldap/metadata.rb
  36. 0  openvpn/attributes/{openvpn.rb → default.rb}
  37. +2 −2 openvpn/metadata.rb
  38. 0  packages/attributes/{packages.rb → default.rb}
  39. +1 −1  packages/metadata.rb
  40. 0  passenger_apache2/attributes/{passenger.rb → default.rb}
  41. +1 −1  passenger_apache2/metadata.rb
  42. 0  passenger_enterprise/attributes/{passenger_enterprise.rb → default.rb}
  43. +1 −1  passenger_enterprise/metadata.rb
  44. 0  postfix/attributes/{postfix.rb → default.rb}
  45. +1 −1  postfix/metadata.rb
  46. 0  postgresql/attributes/{postgresql.rb → default.rb}
  47. +1 −1  postgresql/metadata.rb
  48. 0  quick_start/attributes/{quick_start.rb → default.rb}
  49. +1 −1  quick_start/metadata.rb
  50. 0  rabbitmq/attributes/{rabbitmq.rb → default.rb}
  51. +2 −2 rabbitmq/metadata.rb
  52. +1 −1  rabbitmq_chef/metadata.rb
  53. 0  radiant/attributes/{radiant.rb → default.rb}
  54. +1 −1  radiant/metadata.rb
  55. 0  rails/attributes/{rails.rb → default.rb}
  56. +1 −1  rails/metadata.rb
  57. 0  redmine/attributes/{redmine.rb → default.rb}
  58. +1 −1  redmine/metadata.rb
  59. 0  resolver/attributes/{resolver.rb → default.rb}
  60. +1 −1  resolver/metadata.rb
  61. 0  rsyslog/attributes/{rsyslog.rb → default.rb}
  62. +1 −1  rsyslog/metadata.rb
  63. +5 −2 rsyslog/recipes/client.rb
  64. 0  ruby_enterprise/attributes/{ruby_enterprise.rb → default.rb}
  65. +1 −1  ruby_enterprise/metadata.rb
  66. 0  runit/attributes/{sv_bin.rb → default.rb}
  67. +1 −1  runit/metadata.rb
  68. 0  sbuild/attributes/{sbuild.rb → default.rb}
  69. +1 −1  sbuild/metadata.rb
  70. 0  solr/attributes/{solr.rb → default.rb}
  71. +1 −1  solr/metadata.rb
  72. 0  sudo/attributes/{sudoers.rb → default.rb}
  73. 0  tomcat6/attributes/{tomcat6.rb → default.rb}
  74. +1 −1  tomcat6/metadata.rb
  75. 0  varnish/attributes/{varnish.rb → default.rb}
  76. +1 −1  varnish/metadata.rb
  77. 0  wordpress/attributes/{wordpress.rb → default.rb}
  78. +1 −1  wordpress/metadata.rb
View
3  NOTICE
@@ -9,7 +9,8 @@ Contributors and Copyright holders:
* Copyright 2008-2009, Opscode <legal@opscode.com>
* Copyright 2008-2009, Adam Jacob <adam@opscode.com>
* Copyright 2008-2009, Joshua Timberman <joshua@opscode.com>
+ * Copyright 2009-2010, Barry Steinglass <barry@opscode.com>
* Copyright 2009, Joe Williams <joe@joetify.com>
* Copyright 2009, Joshua Sierles <joshua@37signals.com>
* Copyright 2009, Matthew Kent <mkent@magoazul.com>
-
+ * Copyright 2010, Benjamin Black <b@b3k.us>
View
0  activemq/attributes/activemq.rb → activemq/attributes/default.rb
File renamed without changes
View
2  activemq/metadata.rb
@@ -3,7 +3,7 @@
license "Apache 2.0"
description "Installs activemq and sets it up as a runit service"
long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
-version "0.2"
+version "0.3"
%w{ubuntu debian}.each do |os|
supports os
View
0  apache2/attributes/apache.rb → apache2/attributes/default.rb
File renamed without changes
View
2  apache2/metadata.rb
@@ -3,7 +3,7 @@
license "Apache 2.0"
description "Installs and configures all aspects of apache2 using Debian style symlinks with helper definitions"
long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
-version "0.10.1"
+version "0.11.0"
recipe "apache2", "Main Apache configuration"
recipe "apache2::mod_alias", "Apache module 'alias' with config file"
recipe "apache2::mod_auth_basic", "Apache module 'auth_basic'"
View
0  bootstrap/attributes/bootstrap.rb → bootstrap/attributes/default.rb
File renamed without changes
View
2  bootstrap/metadata.rb
@@ -3,7 +3,7 @@
license "Apache 2.0"
description "Configures RubyGems-installed Chef"
long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
-version "0.10.2"
+version "0.11.0"
%w{ ubuntu debian redhat centos fedora freebsd openbsd }.each do |os|
supports os
View
0  chef/attributes/chef.rb → chef/attributes/default.rb
File renamed without changes
View
2  chef/metadata.rb
@@ -3,7 +3,7 @@
license "Apache 2.0"
description "Installs and configures chef client and server"
long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
-version "0.16.2"
+version "0.17.0"
recipe "chef::client", "Sets up a client to talk to a chef-server"
recipe "chef::server", "Configures a chef API server as a merb application"
View
0  couchdb/attributes/couchdb.rb → couchdb/attributes/default.rb
File renamed without changes
View
2  couchdb/metadata.rb
@@ -9,7 +9,7 @@
directly from source. CouchDB is available on Red Hat-based systems through
the EPEL Yum Repository.
EOH
-version "0.10"
+version "0.11"
depends "erlang"
supports "ubuntu", ">= 8.10" # for package in APT
View
0  djbdns/attributes/djbdns.rb → djbdns/attributes/default.rb
File renamed without changes
View
2  djbdns/metadata.rb
@@ -2,7 +2,7 @@
maintainer_email "cookbooks@opscode.com"
license "Apache 2.0"
description "Installs djbdns and configures DNS services"
-version "0.7"
+version "0.8"
recipe "djbdns", "Installs djbdns from package or source and creates users"
recipe "djbdns::axfr", "Sets up djbdns AXFR service"
recipe "djbdns::cache", "Sets up public dnscache service"
View
0  dynomite/attributes/dynomite.rb → dynomite/attributes/default.rb
File renamed without changes
View
2  dynomite/metadata.rb
@@ -3,7 +3,7 @@
license "Apache 2.0"
description "Installs/Configures dynomite"
long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
-version "0.1"
+version "0.2"
supports "ubuntu"
View
0  erlang/attributes/erlang.rb → erlang/attributes/default.rb
File renamed without changes
View
4 erlang/metadata.rb
@@ -1,8 +1,8 @@
maintainer "Opscode, Inc."
maintainer_email "cookbooks@opscode.com"
license "Apache 2.0"
-description "Installs erlang"
-version "0.7"
+description "Installs erlang, optionally install GUI tools."
+version "0.8"
%w{ ubuntu debian }.each do |os|
supports os
View
1  erlang/recipes/default.rb
@@ -25,4 +25,3 @@
else
package "erlang"
end
-
View
2  gems/metadata.rb
@@ -1,7 +1,7 @@
maintainer "Opscode, Inc."
maintainer_email "cookbooks@opscode.com"
license "Apache 2.0"
-description "Sets up a local gem server repository"
+description "Sets up a local gem server repository or mirror"
long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
version "0.8"
recipe "gems::server", "Sets up a local gem server repository"
View
0  glassfish/attributes/glassfish.rb → glassfish/attributes/default.rb
File renamed without changes
View
2  glassfish/metadata.rb
@@ -3,7 +3,7 @@
license "Apache 2.0"
description "Installs/Configures Glassfish"
long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
-version "0.1"
+version "0.2"
recipe "glassfish", "Main Glassfish configuration"
%w{redhat centos debian ubuntu}.each do |os|
View
0  jira/attributes/jira.rb → jira/attributes/default.rb
File renamed without changes
View
2  jira/metadata.rb
@@ -2,7 +2,7 @@
maintainer_email "cookbooks@opscode.com"
license "Apache 2.0"
description "Installs and configures jira"
-version "0.7"
+version "0.8"
recommends "mysql"
%w{ ubuntu debian }.each do |os|
View
0  kickstart/attributes/kickstart.rb → kickstart/attributes/default.rb
File renamed without changes
View
4 kickstart/metadata.rb
@@ -1,9 +1,9 @@
maintainer "Opscode"
maintainer_email "cookbooks@opscode.com"
license "Apache 2.0"
-description "Installs/Configures kickstart"
+description "Creates apache2 vhost and serves a kickstart file."
long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
-version "0.2"
+version "0.3"
depends "apache2"
supports "redhat"
supports "centos"
View
0  maradns/attributes/maradns.rb → maradns/attributes/default.rb
File renamed without changes
View
2  maradns/metadata.rb
@@ -2,7 +2,7 @@
maintainer_email "cookbooks@opscode.com"
license "Apache 2.0"
description "Installs and configures maradns"
-version "0.7"
+version "0.8"
%w{ ubuntu debian }.each do |os|
supports os
View
0  memcached/attributes/memcached.rb → memcached/attributes/default.rb
File renamed without changes
View
2  memcached/metadata.rb
@@ -3,7 +3,7 @@
license "Apache 2.0"
description "Installs memcached and provides a define to set up an instance of memcache via runit"
long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
-version "0.9"
+version "0.10"
depends "runit"
%w{ ubuntu debian }.each do |os|
supports os
View
0  nginx/attributes/nginx.rb → nginx/attributes/default.rb
File renamed without changes
View
2  nginx/metadata.rb
@@ -2,7 +2,7 @@
maintainer_email "cookbooks@opscode.com"
license "Apache 2.0"
description "Installs and configures nginx"
-version "0.10"
+version "0.11"
%w{ ubuntu debian }.each do |os|
supports os
View
0  ntp/attributes/ntp.rb → ntp/attributes/default.rb
File renamed without changes
View
2  ntp/metadata.rb
@@ -2,7 +2,7 @@
maintainer_email "cookbooks@opscode.com"
license "Apache 2.0"
description "Installs and configures ntp as a client or server"
-version "0.7"
+version "0.8"
%w{ ubuntu debian redhat centos fedora }.each do |os|
supports os
View
0  openldap/attributes/openldap.rb → openldap/attributes/default.rb
File renamed without changes
View
2  openldap/metadata.rb
@@ -3,7 +3,7 @@
license "Apache 2.0"
description "Configures a server to be an OpenLDAP master, replication slave or client for auth"
long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
-version "0.7"
+version "0.8"
recipe "openldap::auth", "Set up openldap for user authentication"
recipe "openldap::client", "Install openldap client packages"
recipe "openldap::server", "Set up openldap to be a slapd server"
View
0  openvpn/attributes/openvpn.rb → openvpn/attributes/default.rb
File renamed without changes
View
4 openvpn/metadata.rb
@@ -1,9 +1,9 @@
maintainer "Opscode, Inc."
maintainer_email "cookbooks@opscode.com"
license "Apache 2.0"
-description "Installs and configures openvpn"
+description "Installs and configures openvpn and includes rake tasks for managing certs"
long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
-version "0.7"
+version "0.8"
%w{ redhat centos fedora ubuntu debian }.each do |os|
supports os
View
0  packages/attributes/packages.rb → packages/attributes/default.rb
File renamed without changes
View
2  packages/metadata.rb
@@ -2,7 +2,7 @@
maintainer_email "cookbooks@opscode.com"
license "Apache 2.0"
description "Helper library to determine whether distribution-only packages are installed"
-version "0.8"
+version "0.9"
%w{redhat centos}.each do |os|
supports os
View
0  passenger_apache2/attributes/passenger.rb → passenger_apache2/attributes/default.rb
File renamed without changes
View
2  passenger_apache2/metadata.rb
@@ -3,7 +3,7 @@
license "Apache 2.0"
description "Installs passenger for Apache2"
long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
-version "0.14"
+version "0.15"
%w{ packages ruby apache2 rails }.each do |cb|
depends cb
View
0  ...ger_enterprise/attributes/passenger_enterprise.rb → passenger_enterprise/attributes/default.rb
File renamed without changes
View
2  passenger_enterprise/metadata.rb
@@ -3,7 +3,7 @@
license "Apache 2.0"
description "Installs and configures Passenger under Ruby Enterprise Edition with Apache"
long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
-version "0.2"
+version "0.3"
%w{ ruby_enterprise nginx apache2 }.each do |cb|
depends cb
View
0  postfix/attributes/postfix.rb → postfix/attributes/default.rb
File renamed without changes
View
2  postfix/metadata.rb
@@ -2,7 +2,7 @@
maintainer_email "cookbooks@opscode.com"
license "Apache 2.0"
description "Installs and configures postfix for client or outbound relayhost, or to do SASL auth"
-version "0.7"
+version "0.8"
recipe "postfix::sasl_auth", "Set up postfix to auth to a server with sasl"
%w{ubuntu debian}.each do |os|
View
0  postgresql/attributes/postgresql.rb → postgresql/attributes/default.rb
File renamed without changes
View
2  postgresql/metadata.rb
@@ -3,7 +3,7 @@
license "Apache 2.0"
description "Installs and configures postgresql for clients or servers"
long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
-version "0.7"
+version "0.8"
recipe "postgresql::client", "Installs postgresql client package(s)"
recipe "postgresql::server", "Installs postgresql server packages, templates"
View
0  quick_start/attributes/quick_start.rb → quick_start/attributes/default.rb
File renamed without changes
View
2  quick_start/metadata.rb
@@ -2,7 +2,7 @@
maintainer_email "cookbooks@opscode.com"
license "Apache 2.0"
description "Example cookbook for quick_start wiki document"
-version "0.7"
+version "0.8"
%w{
redhat fedora centos
View
0  rabbitmq/attributes/rabbitmq.rb → rabbitmq/attributes/default.rb
File renamed without changes
View
4 rabbitmq/metadata.rb
@@ -2,7 +2,7 @@
maintainer_email "b@b3k.us"
license "Apache 2.0"
description "Installs and configures RabbitMQ server"
-version "0.1"
+version "0.2"
recipe "rabbitmq::cluster", "Set up RabbitMQ clustering."
%w{ubuntu debian}.each do |os|
@@ -58,4 +58,4 @@
attribute "rabbitmq/erlang_cookie",
:display_name => "RabbitMQ Erlang cookie",
:description => "Access cookie for clustering nodes. There is no default."
-
+
View
2  rabbitmq_chef/metadata.rb
@@ -1,7 +1,7 @@
maintainer "Opscode, Inc."
maintainer_email "cookbooks@opscode.com"
license "Apache 2.0"
-description "Installs the RabbitMQ AMQP Broker"
+description "Installs the RabbitMQ AMQP Broker for use on a Chef Server."
version "0.10"
%w{ centos redhat fedora ubuntu debian }.each do |os|
View
0  radiant/attributes/radiant.rb → radiant/attributes/default.rb
File renamed without changes
View
2  radiant/metadata.rb
@@ -3,7 +3,7 @@
license "Apache 2.0"
description "Installs radiant from Git repository"
long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
-version "0.9"
+version "0.10"
%w{ git sqlite rails apache2 mysql passenger_apache2 apache2 }.each do |cb|
depends cb
View
0  rails/attributes/rails.rb → rails/attributes/default.rb
File renamed without changes
View
2  rails/metadata.rb
@@ -3,7 +3,7 @@
license "Apache 2.0"
description "Installs rails and provides a sample template for use with passenger"
long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
-version "0.8"
+version "0.9"
%w{ ruby apache2 }.each do |cb|
depends cb
View
0  redmine/attributes/redmine.rb → redmine/attributes/default.rb
File renamed without changes
View
2  redmine/metadata.rb
@@ -2,7 +2,7 @@
maintainer_email "cookbooks@opscode.com"
license "Apache 2.0"
description "Installs and configures redmine as a Rails app in passenger+apache2"
-version "0.9"
+version "0.10"
%w{ apache2 rails passenger_apache2 mysql sqlite }.each do |cb|
depends cb
View
0  resolver/attributes/resolver.rb → resolver/attributes/default.rb
File renamed without changes
View
2  resolver/metadata.rb
@@ -2,7 +2,7 @@
maintainer_email "cookbooks@opscode.com"
license "Apache 2.0"
description "Configures /etc/resolv.conf"
-version "0.7"
+version "0.8"
%w{ ubuntu debian fedora centos redhat freebsd openbsd macosx }.each do |os|
supports os
View
0  rsyslog/attributes/rsyslog.rb → rsyslog/attributes/default.rb
File renamed without changes
View
2  rsyslog/metadata.rb
@@ -3,7 +3,7 @@
license "Apache 2.0"
description "Installs and configures rsyslog"
long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
-version "0.7"
+version "0.8"
recipe "rsyslog::client", "Sets up a client to log to a remote rsyslog server"
recipe "rsyslog::server", "Sets up an rsyslog server"
View
7 rsyslog/recipes/client.rb
@@ -19,13 +19,16 @@
include_recipe "rsyslog"
-rsyslog_server = node[:rsyslog][:server] ? node[:rsyslog][:server] : search(:node, "rsyslog_server:true").map { |n| n["fqdn"] }.first
+rsyslog_server = node[:rsyslog][:server] ? node[:rsyslog][:server] : search(:node, "rsyslog_server:true", nil, 0, 1)
unless node[:rsyslog][:server]
template "/etc/rsyslog.d/remote.conf" do
source "remote.conf.erb"
backup false
- variables :server => rsyslog_server, :protocol => node[:rsyslog][:protocol]
+ variables(
+ :server => rsyslog_server['fqdn'],
+ :protocol => node[:rsyslog][:protocol]
+ )
owner "root"
group "root"
mode 0644
View
0  ruby_enterprise/attributes/ruby_enterprise.rb → ruby_enterprise/attributes/default.rb
File renamed without changes
View
2  ruby_enterprise/metadata.rb
@@ -3,7 +3,7 @@
license "Apache 2.0"
description "Installs/Configures ruby-enterprise"
long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
-version "0.1"
+version "0.2"
depends "build-essential"
supports "ubuntu"
View
0  runit/attributes/sv_bin.rb → runit/attributes/default.rb
File renamed without changes
View
2  runit/metadata.rb
@@ -2,7 +2,7 @@
maintainer_email "cookbooks@opscode.com"
license "Apache 2.0"
description "Installs runit and provides runit_service definition"
-version "0.9"
+version "0.10"
%w{ ubuntu debian }.each do |os|
supports os
View
0  sbuild/attributes/sbuild.rb → sbuild/attributes/default.rb
File renamed without changes
View
2  sbuild/metadata.rb
@@ -3,7 +3,7 @@
license "Apache 2.0"
description "Creates an sbuild host for debian packages."
long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
-version "0.2"
+version "0.3"
depends "xfs"
depends "lvm"
View
0  solr/attributes/solr.rb → solr/attributes/default.rb
File renamed without changes
View
2  solr/metadata.rb
@@ -3,7 +3,7 @@
license "Apache 2.0"
description "Sets up environment for solr instances"
long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
-version "0.7"
+version "0.8"
suggests "ruby"
%w{ java capistrano runit }.each do |cb|
View
0  sudo/attributes/sudoers.rb → sudo/attributes/default.rb
File renamed without changes
View
0  tomcat6/attributes/tomcat6.rb → tomcat6/attributes/default.rb
File renamed without changes
View
2  tomcat6/metadata.rb
@@ -3,7 +3,7 @@
license "Apache 2.0"
description "Installs and configures all aspects of tomcat6 using custom local installation"
long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
-version "0.1"
+version "0.2"
recipe "tomcat6", "Main Tomcat 6 configuration"
%w{redhat centos debian ubuntu}.each do |os|
View
0  varnish/attributes/varnish.rb → varnish/attributes/default.rb
File renamed without changes
View
2  varnish/metadata.rb
@@ -2,7 +2,7 @@
maintainer_email "cookbooks@opscode.com"
license "Apache 2.0"
description "Instsalls and configures varnish"
-version "0.7"
+version "0.8"
%w{ubuntu debian}.each do |os|
supports os
View
0  wordpress/attributes/wordpress.rb → wordpress/attributes/default.rb
File renamed without changes
View
2  wordpress/metadata.rb
@@ -3,7 +3,7 @@
license "Apache 2.0"
description "Installs/Configures wordpress"
long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
-version "0.5"
+version "0.6"
depends "php"
depends "apache2"
depends "mysql"
Please sign in to comment.
Something went wrong with that request. Please try again.