Updating for Chef 0.8 changes.

* Use 'default.rb' for attributes files when specific files not necessary * Update search in rsyslog recipe.
gilles · Apr 29, 2010 · ef7e6a1 · ef7e6a1
1 parent 24f6358
commit ef7e6a1
Show file tree

Hide file tree

Showing 78 changed files with 49 additions and 46 deletions.
diff --git a/NOTICE b/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>
diff --git a/activemq/attributes/activemq.rb → activemq/attributes/default.rb b/activemq/attributes/activemq.rb → activemq/attributes/default.rb
diff --git a/activemq/metadata.rb b/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

diff --git a/apache2/attributes/apache.rb → apache2/attributes/default.rb b/apache2/attributes/apache.rb → apache2/attributes/default.rb
diff --git a/apache2/metadata.rb b/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'"

diff --git a/bootstrap/attributes/bootstrap.rb → bootstrap/attributes/default.rb b/bootstrap/attributes/bootstrap.rb → bootstrap/attributes/default.rb
diff --git a/bootstrap/metadata.rb b/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

diff --git a/chef/attributes/chef.rb → chef/attributes/default.rb b/chef/attributes/chef.rb → chef/attributes/default.rb
diff --git a/chef/metadata.rb b/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"
 

diff --git a/couchdb/attributes/couchdb.rb → couchdb/attributes/default.rb b/couchdb/attributes/couchdb.rb → couchdb/attributes/default.rb
diff --git a/couchdb/metadata.rb b/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

diff --git a/djbdns/attributes/djbdns.rb → djbdns/attributes/default.rb b/djbdns/attributes/djbdns.rb → djbdns/attributes/default.rb
diff --git a/djbdns/metadata.rb b/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"

diff --git a/dynomite/attributes/dynomite.rb → dynomite/attributes/default.rb b/dynomite/attributes/dynomite.rb → dynomite/attributes/default.rb
diff --git a/dynomite/metadata.rb b/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"
 

diff --git a/erlang/attributes/erlang.rb → erlang/attributes/default.rb b/erlang/attributes/erlang.rb → erlang/attributes/default.rb
diff --git a/erlang/metadata.rb b/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

diff --git a/erlang/recipes/default.rb b/erlang/recipes/default.rb
@@ -25,4 +25,3 @@
 else
   package "erlang"
 end
-
diff --git a/gems/metadata.rb b/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"

diff --git a/glassfish/attributes/glassfish.rb → glassfish/attributes/default.rb b/glassfish/attributes/glassfish.rb → glassfish/attributes/default.rb
diff --git a/glassfish/metadata.rb b/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|

diff --git a/jira/attributes/jira.rb → jira/attributes/default.rb b/jira/attributes/jira.rb → jira/attributes/default.rb
diff --git a/jira/metadata.rb b/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|

diff --git a/kickstart/attributes/kickstart.rb → kickstart/attributes/default.rb b/kickstart/attributes/kickstart.rb → kickstart/attributes/default.rb
diff --git a/kickstart/metadata.rb b/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"
diff --git a/maradns/attributes/maradns.rb → maradns/attributes/default.rb b/maradns/attributes/maradns.rb → maradns/attributes/default.rb
diff --git a/maradns/metadata.rb b/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

diff --git a/memcached/attributes/memcached.rb → memcached/attributes/default.rb b/memcached/attributes/memcached.rb → memcached/attributes/default.rb
diff --git a/memcached/metadata.rb b/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

diff --git a/nginx/attributes/nginx.rb → nginx/attributes/default.rb b/nginx/attributes/nginx.rb → nginx/attributes/default.rb
diff --git a/nginx/metadata.rb b/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

diff --git a/ntp/attributes/ntp.rb → ntp/attributes/default.rb b/ntp/attributes/ntp.rb → ntp/attributes/default.rb
diff --git a/ntp/metadata.rb b/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

diff --git a/openldap/attributes/openldap.rb → openldap/attributes/default.rb b/openldap/attributes/openldap.rb → openldap/attributes/default.rb
diff --git a/openldap/metadata.rb b/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"

diff --git a/openvpn/attributes/openvpn.rb → openvpn/attributes/default.rb b/openvpn/attributes/openvpn.rb → openvpn/attributes/default.rb
diff --git a/openvpn/metadata.rb b/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

diff --git a/packages/attributes/packages.rb → packages/attributes/default.rb b/packages/attributes/packages.rb → packages/attributes/default.rb
diff --git a/packages/metadata.rb b/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

diff --git a/passenger_apache2/attributes/passenger.rb → passenger_apache2/attributes/default.rb b/passenger_apache2/attributes/passenger.rb → passenger_apache2/attributes/default.rb
diff --git a/passenger_apache2/metadata.rb b/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

diff --git a/...rprise/attributes/passenger_enterprise.rb → passenger_enterprise/attributes/default.rb b/...rprise/attributes/passenger_enterprise.rb → passenger_enterprise/attributes/default.rb
diff --git a/passenger_enterprise/metadata.rb b/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

diff --git a/postfix/attributes/postfix.rb → postfix/attributes/default.rb b/postfix/attributes/postfix.rb → postfix/attributes/default.rb
diff --git a/postfix/metadata.rb b/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|

diff --git a/postgresql/attributes/postgresql.rb → postgresql/attributes/default.rb b/postgresql/attributes/postgresql.rb → postgresql/attributes/default.rb
diff --git a/postgresql/metadata.rb b/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"
 

diff --git a/quick_start/attributes/quick_start.rb → quick_start/attributes/default.rb b/quick_start/attributes/quick_start.rb → quick_start/attributes/default.rb
diff --git a/quick_start/metadata.rb b/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

diff --git a/rabbitmq/attributes/rabbitmq.rb → rabbitmq/attributes/default.rb b/rabbitmq/attributes/rabbitmq.rb → rabbitmq/attributes/default.rb
diff --git a/rabbitmq/metadata.rb b/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."
-
+
diff --git a/rabbitmq_chef/metadata.rb b/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|

diff --git a/radiant/attributes/radiant.rb → radiant/attributes/default.rb b/radiant/attributes/radiant.rb → radiant/attributes/default.rb
diff --git a/radiant/metadata.rb b/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

diff --git a/rails/attributes/rails.rb → rails/attributes/default.rb b/rails/attributes/rails.rb → rails/attributes/default.rb
diff --git a/rails/metadata.rb b/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

diff --git a/redmine/attributes/redmine.rb → redmine/attributes/default.rb b/redmine/attributes/redmine.rb → redmine/attributes/default.rb
diff --git a/redmine/metadata.rb b/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

diff --git a/resolver/attributes/resolver.rb → resolver/attributes/default.rb b/resolver/attributes/resolver.rb → resolver/attributes/default.rb
diff --git a/resolver/metadata.rb b/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

diff --git a/rsyslog/attributes/rsyslog.rb → rsyslog/attributes/default.rb b/rsyslog/attributes/rsyslog.rb → rsyslog/attributes/default.rb
diff --git a/rsyslog/metadata.rb b/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"
 

diff --git a/rsyslog/recipes/client.rb b/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

diff --git a/..._enterprise/attributes/ruby_enterprise.rb → ruby_enterprise/attributes/default.rb b/..._enterprise/attributes/ruby_enterprise.rb → ruby_enterprise/attributes/default.rb
diff --git a/ruby_enterprise/metadata.rb b/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"
diff --git a/runit/attributes/sv_bin.rb → runit/attributes/default.rb b/runit/attributes/sv_bin.rb → runit/attributes/default.rb
diff --git a/runit/metadata.rb b/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

diff --git a/sbuild/attributes/sbuild.rb → sbuild/attributes/default.rb b/sbuild/attributes/sbuild.rb → sbuild/attributes/default.rb
diff --git a/sbuild/metadata.rb b/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"
diff --git a/solr/attributes/solr.rb → solr/attributes/default.rb b/solr/attributes/solr.rb → solr/attributes/default.rb
diff --git a/solr/metadata.rb b/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|

diff --git a/sudo/attributes/sudoers.rb → sudo/attributes/default.rb b/sudo/attributes/sudoers.rb → sudo/attributes/default.rb
diff --git a/tomcat6/attributes/tomcat6.rb → tomcat6/attributes/default.rb b/tomcat6/attributes/tomcat6.rb → tomcat6/attributes/default.rb
diff --git a/tomcat6/metadata.rb b/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|

diff --git a/varnish/attributes/varnish.rb → varnish/attributes/default.rb b/varnish/attributes/varnish.rb → varnish/attributes/default.rb
diff --git a/varnish/metadata.rb b/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

diff --git a/wordpress/attributes/wordpress.rb → wordpress/attributes/default.rb b/wordpress/attributes/wordpress.rb → wordpress/attributes/default.rb
diff --git a/wordpress/metadata.rb b/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"