Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update to couchdb 1.2.0 and minor recipe improvements #1

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions attributes/default.rb
Expand Up @@ -17,6 +17,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.

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"
set['couch_db']['src_checksum'] = '0f254ddea2471dbc4d3c6cd1fa61e4782c75475fb325024e10f68bf1aa8d5c37'
set['couch_db']['src_version'] = '1.2.0'
set['couch_db']['src_mirror'] = "http://archive.apache.org/dist/couchdb/releases/#{node['couch_db']['src_version']}/apache-couchdb-#{node['couch_db']['src_version']}.tar.gz"
2 changes: 1 addition & 1 deletion metadata.rb
Expand Up @@ -9,7 +9,7 @@
directly from source. CouchDB is available on Red Hat-based systems through
the EPEL Yum Repository.
EOH
version "1.0.0"
version "1.0.1"
depends "erlang"
recipe "couchdb", "Installs and configures CouchDB package"
recipe "couchdb::source", "Installs and configures CouchDB from source"
Expand Down
15 changes: 11 additions & 4 deletions recipes/source.rb
Expand Up @@ -28,29 +28,36 @@
compile_flags = String.new
dev_pkgs = Array.new

case node['platform']
when "debian", "ubuntu"
if %w(debian ubuntu).include?(node['platform'])

dev_pkgs << "libicu-dev"
dev_pkgs << "libcurl4-openssl-dev"
dev_pkgs << value_for_platform(
"debian" => { "default" => "libmozjs-dev" },
"ubuntu" => {
'8.10' => 'xulrunner-dev',
"9.04" => "libmozjs-dev",
"9.10" => "libmozjs-dev",
"default" => "xulrunner-dev"
'10.04' => 'xulrunner-dev',
'10.10' => 'xulrunner-dev',
'11.04' => 'libmozjs-dev',
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line should be removed, since it duplicates the default case.

'default' => 'libmozjs-dev'
}
)

dev_pkgs.each do |pkg|
package pkg
end

if node['platform_version'].to_f >= 10.04
if node['platform_version'].to_f >= 11.04
execute 'apt-get -y build-dep couchdb'
elsif 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']
Expand Down