Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

bump chef version to 0.8.6

  • Loading branch information...
commit 7e16cb515265eece29b1bb7b4481ce69f4702f59 1 parent daf58b8
@jtimberman jtimberman authored
View
4 bootstrap/attributes/bootstrap.rb
@@ -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.4"
-set_unless[:bootstrap][:chef][:client_version] = "0.8.4"
+set_unless[:bootstrap][:chef][:server_version] = "0.8.6"
+set_unless[:bootstrap][:chef][:client_version] = "0.8.6"
set_unless[:bootstrap][:chef][:client_interval] = "1800"
set_unless[:bootstrap][:chef][:client_splay] = "20"
set_unless[:bootstrap][:chef][:log_dir] = "/var/log/chef"
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"
+version "0.10.1"
%w{ ubuntu debian redhat centos fedora freebsd openbsd }.each do |os|
supports os
View
6 chef/attributes/chef.rb
@@ -3,7 +3,7 @@
# Cookbook Name:: chef
# Attributes:: chef
#
-# 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.
@@ -36,8 +36,8 @@
set_unless[:chef][:serve_path] = "/srv/chef"
end
-set_unless[:chef][:server_version] = "0.8.4"
-set_unless[:chef][:client_version] = "0.8.4"
+set_unless[:chef][:server_version] = "0.8.6"
+set_unless[:chef][:client_version] = "0.8.6"
set_unless[:chef][:client_interval] = "1800"
set_unless[:chef][:client_splay] = "20"
set_unless[:chef][:log_dir] = "/var/log/chef"
View
73 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"
+version "0.16.1"
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"
@@ -14,74 +14,3 @@
%w{ runit couchdb rabbitmq_chef apache2 openssl zlib xml java }.each do |cb|
depends cb
end
-
-attribute "chef/path",
- :display_name => "Chef Path",
- :description => "Filesystem location for Chef files",
- :default => "/srv/chef"
-
-attribute "chef/run_path",
- :display_name => "Chef Run Path",
- :description => "Filesystem location for Chef 'run' files",
- :default => "/var/run/chef"
-
-attribute "chef/client_version",
- :display_name => "Chef Client Version",
- :description => "Set the version of the client gem to install",
- :default => "0.8.4"
-
-attribute "chef/client_interval",
- :display_name => "Chef Client Interval ",
- :description => "Poll chef client process to run on this interval in seconds",
- :default => "1800"
-
-attribute "chef/client_splay",
- :display_name => "Chef Client Splay ",
- :description => "Random number of seconds to add to interval",
- :default => "20"
-
-attribute "chef/client_log",
- :display_name => "Chef Client Log",
- :description => "Location of the chef client log",
- :default => "STDOUT"
-
-attribute "chef/indexer_log",
- :display_name => "Chef Indexer Log ",
- :description => "Location of the chef-indexer log",
- :default => "/var/log/chef/indexer.log"
-
-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.4"
-
-attribute "chef/server_log",
- :display_name => "Chef Server Log",
- :description => "Location of the Chef server log",
- :default => "/var/log/chef/server.log"
-
-attribute "chef/server_path",
- :display_name => "Chef Server Path",
- :description => "Location of the Chef Server assets",
- :default => "gem_dir/gems/chef-server-chef_server_version"
-
-attribute "chef/server_hostname",
- :display_name => "Chef Server Hostname",
- :description => "Hostname for the chef server, for building FQDN",
- :default => "hostname"
-
-attribute "chef/server_fqdn",
- :display_name => "Chef Server Fully Qualified Domain Name",
- :description => "FQDN of the Chef server for Apache vhost and SSL certificate and clients",
- :default => "hostname.domain"
-
-attribute "chef/server_ssl_req",
- :display_name => "Chef Server SSL Request",
- :description => "Data to pass for creating the SSL certificate",
- :default => "/C=US/ST=Several/L=Locality/O=Example/OU=Operations/CN=chef_server_fqdn/emailAddress=ops@domain"
-
-attribute "chef/server_token",
- :display_name => "Chef Server Validation Token",
- :description => "Value of the validation_token",
- :default => "randomly generated"
-
Please sign in to comment.
Something went wrong with that request. Please try again.