Permalink
Browse files

Bumping chef versions to 0.8.4, adding erlang to couchdb and dropping…

… certificates from bootstrap
  • Loading branch information...
1 parent e018340 commit 6a625304cf64b19b17e00ce920564a4a0944f058 @jtimberman jtimberman committed Mar 2, 2010
@@ -2,7 +2,7 @@
# Cookbook Name:: bootstrap
# Attributes:: bootstrap
#
-# Copyright 2008-2009, Opscode, Inc.
+# Copyright 2008-2010, Opscode, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -32,8 +32,8 @@
set_unless[:bootstrap][:chef][:webui_admin_password] = secure_password
set_unless[:bootstrap][:chef][:validation_client_name] = "chef-validator"
-set_unless[:bootstrap][:chef][:server_version] = "0.8.2"
-set_unless[:bootstrap][:chef][:client_version] = "0.8.2"
+set_unless[:bootstrap][:chef][:server_version] = "0.8.4"
+set_unless[:bootstrap][:chef][:client_version] = "0.8.4"
set_unless[:bootstrap][:chef][:client_interval] = "1800"
set_unless[:bootstrap][:chef][:client_splay] = "20"
set_unless[:bootstrap][:chef][:log_dir] = "/var/log/chef"
@@ -96,29 +96,7 @@
)
end
-bash "Create WebUI SSL Certificate" do
- cwd "/etc/chef"
- code <<-EOH
- umask 077
- openssl genrsa 2048 > webui.key
- openssl req -subj "#{node[:bootstrap][:chef][:server_ssl_req]}" -new -x509 -nodes -sha1 -days 3650 -key webui.key > webui.crt
- cat webui.key webui.crt > webui.pem
- EOH
- not_if { File.exists?("/etc/chef/webui.pem") }
-end
-
-bash "Create Validation SSL Certificate" do
- cwd "/etc/chef"
- code <<-EOH
- umask 077
- openssl genrsa 2048 > validation.key
- openssl req -subj "#{node[:bootstrap][:chef][:server_ssl_req]}" -new -x509 -nodes -sha1 -days 3650 -key validation.key > validation.crt
- cat validation.key validation.crt > validation.pem
- EOH
- not_if { File.exists?("/etc/chef/validation.pem") }
-end
-
-%w{ openid cache search_index openid/cstore openid/store }.each do |dir|
+%w{ cache search_index }.each do |dir|
directory "#{node[:bootstrap][:chef][:path]}/#{dir}" do
owner "root"
group root_group
@@ -36,8 +36,8 @@
set_unless[:chef][:serve_path] = "/srv/chef"
end
-set_unless[:chef][:server_version] = "0.8.2"
-set_unless[:chef][:client_version] = "0.8.2"
+set_unless[:chef][:server_version] = "0.8.4"
+set_unless[:chef][:client_version] = "0.8.4"
set_unless[:chef][:client_interval] = "1800"
set_unless[:chef][:client_splay] = "20"
set_unless[:chef][:log_dir] = "/var/log/chef"
View
@@ -28,7 +28,7 @@
attribute "chef/client_version",
:display_name => "Chef Client Version",
:description => "Set the version of the client gem to install",
- :default => "0.8.2"
+ :default => "0.8.4"
attribute "chef/client_interval",
:display_name => "Chef Client Interval ",
@@ -53,7 +53,7 @@
attribute "chef/server_version",
:display_name => "Chef Server Version",
:description => "Set the version of the server and server-slice gems to install",
- :default => "0.8.2"
+ :default => "0.8.4"
attribute "chef/server_log",
:display_name => "Chef Server Log",
@@ -65,7 +65,7 @@
http_request "compact chef couchDB" do
action :post
- url "#{Chef::Config[:couchdb_url]}/_compact"
+ url "#{Chef::Config[:couchdb_url]}/chef/_compact"
only_if do
begin
open("#{Chef::Config[:couchdb_url]}/chef")
@@ -17,6 +17,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+include_recipe "erlang"
+
package "couchdb" do
package_name value_for_platform(
"openbsd" => { "default" => "apache-couchdb" },

0 comments on commit 6a62530

Please sign in to comment.