Permalink
Browse files

update to couchdb 1.0.2 and minor doc improvements

  • Loading branch information...
1 parent 55536fd commit 46f21fbafdf625dbeafabd5c4ee5fbc775e5c2ef @jtimberman jtimberman committed May 31, 2011
Showing with 22 additions and 22 deletions.
  1. +10 −10 README.md
  2. +3 −3 attributes/default.rb
  3. +9 −9 recipes/source.rb
View
20 README.md
@@ -1,31 +1,31 @@
DESCRIPTION
===========
+Installs and configures CouchDB. Optionally can install CouchDB from sources.
+
REQUIREMENTS
============
Requires a platform that can install Erlang from distribution packages.
-Platform
---------
+## Platform
-Works on Debian 5+, Ubuntu 8.10+, OpenBSD and FreeBSD.
+Tested on Debian 5+, Ubuntu 8.10+, OpenBSD and FreeBSD.
Also works on Red Hat, CentOS and Fedora, requires the EPEL yum repository.
-Cookbooks
----------
+## Cookbooks
-Requires the erlang cookbook so erlang can be installed.
+* erlang
ATTRIBUTES
==========
Cookbook attributes are named under the `couch_db` keyspace. The attributes specified in the cookbook are used in the `couchdb::source` recipe only.
-* `node[:couch_db][:src_checksum]` - sha256sum of the default version of couchdb to download
-* `node[:couch_db][:src_version]` - default version of couchdb to download, used in the full URL to download.
-* `node[:couch_db][:src_mirror]` - full URL to download.
+* `node['couch_db']['src_checksum']` - sha256sum of the default version of couchdb to download
+* `node['couch_db']['src_version']` - default version of couchdb to download, used in the full URL to download.
+* `node['couch_db']['src_mirror']` - full URL to download.
RECIPES
=======
@@ -45,7 +45,7 @@ LICENSE AND AUTHOR
Author:: Joshua Timberman (<joshua@opscode.com>)
-Copyright 2009, Opscode, Inc.
+Copyright 2009-2011, Opscode, Inc.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
View
6 attributes/default.rb
@@ -17,6 +17,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-set[:couch_db][:src_checksum] = "b74a5bfe13e3457798107509cb533d0e7df276adad526ccd5a381c1271108b1f"
-set[:couch_db][:src_version] = "1.0.1"
-set[:couch_db][:src_mirror] = "http://archive.apache.org/dist/couchdb/#{couch_db.src_version}/apache-couchdb-#{couch_db.src_version}.tar.gz"
+set['couch_db']['src_checksum'] = "6ef82a7ba0f132d55af7cc78b30658d5b3a4f7be3f449308c8d7fa2ad473677c"
+set['couch_db']['src_version'] = "1.0.2"
+set['couch_db']['src_mirror'] = "http://archive.apache.org/dist/couchdb/#{node['couch_db']['src_version']}/apache-couchdb-#{node['couch_db']['src_version']}.tar.gz"
View
18 recipes/source.rb
@@ -17,18 +17,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-if node[:platform] == "ubuntu" && node[:platform_version].to_f == 8.04
- log "Ubuntu 8.04 does not supply sufficient development libraries via APT to install CouchDB #{node[:couch_db][:src_version]} from source."
+if node['platform'] == "ubuntu" && node['platform_version'].to_f == 8.04
+ log "Ubuntu 8.04 does not supply sufficient development libraries via APT to install CouchDB #{node['couch_db']['src_version']} from source."
return
end
include_recipe "erlang"
-couchdb_tar_gz = File.join(Chef::Config[:file_cache_path], "/", "apache-couchdb-#{node[:couch_db][:src_version]}.tar.gz")
+couchdb_tar_gz = File.join(Chef::Config[:file_cache_path], "/", "apache-couchdb-#{node['couch_db']['src_version']}.tar.gz")
compile_flags = String.new
dev_pkgs = Array.new
-case node[:platform]
+case node['platform']
when "debian", "ubuntu"
dev_pkgs << "libicu-dev"
@@ -46,21 +46,21 @@
package pkg
end
- if node[:platform_version].to_f >= 10.04
+ if node['platform_version'].to_f >= 10.04
compile_flags = "--with-js-lib=/usr/lib/xulrunner-devel-1.9.2.8/lib --with-js-include=/usr/lib/xulrunner-devel-1.9.2.8/include"
end
end
remote_file couchdb_tar_gz do
- checksum node[:couch_db][:src_checksum]
- source node[:couch_db][:src_mirror]
+ checksum node['couch_db']['src_checksum']
+ source node['couch_db']['src_mirror']
end
-bash "install couchdb #{node[:couch_db][:src_version]}" do
+bash "install couchdb #{node['couch_db']['src_version']}" do
cwd Chef::Config[:file_cache_path]
code <<-EOH
tar -zxf #{couchdb_tar_gz}
- cd apache-couchdb-#{node[:couch_db][:src_version]} && ./configure #{compile_flags} && make && make install
+ cd apache-couchdb-#{node['couch_db']['src_version']} && ./configure #{compile_flags} && make && make install
EOH
not_if { ::FileTest.exists?("/usr/local/bin/couchdb") }
end

0 comments on commit 46f21fb

Please sign in to comment.