Chef version bump (0.9.0)

chef/attributes/chef.rb

@@ -1,5 +1,5 @@
-set_unless[:chef][:syslog] = false
-set_unless[:chef][:client][:server_url] = "http://chef.#{node[:domain]}:4000"
-set_unless[:chef][:server][:amqp_pass] = "testing"
-set_unless[:chef][:server][:server_proxy_port] = "4443"
-set_unless[:chef][:server][:webui_proxy_port] = "4483"
+default[:chef][:syslog] = false
+default[:chef][:client][:server_url] = "http://chef.#{node[:domain]}:4000"
+default[:chef][:server][:amqp_pass] = "testing"
+default[:chef][:server][:server_proxy_port] = "4443"
+default[:chef][:server][:webui_proxy_port] = "4483"

chef/recipes/client.rb

@@ -1,22 +1,23 @@
 include_recipe "gentoo::portage"
 include_recipe "chef::overlay"
 
-gentoo_package_keywords "=app-admin/chef-0.8.16"
+gentoo_package_keywords "=app-admin/chef-0.9.0"
 gentoo_package_keywords "=dev-ruby/abstract-1.0.0"
 gentoo_package_keywords "=dev-ruby/bunny-0.6.0"
 gentoo_package_keywords "=dev-ruby/erubis-2.6.5"
-gentoo_package_keywords "=dev-ruby/eventmachine-0.12.10-r2"
-gentoo_package_keywords "=dev-ruby/extlib-0.9.14"
-gentoo_package_keywords "=dev-ruby/json-1.4.2"
+gentoo_package_keywords "=dev-ruby/extlib-0.9.15"
+gentoo_package_keywords "=dev-ruby/highline-1.5.2-r1"
+gentoo_package_keywords "=dev-ruby/mime-types-1.16-r2"
 gentoo_package_keywords "=dev-ruby/mixlib-authentication-1.1.2"
 gentoo_package_keywords "=dev-ruby/mixlib-cli-1.2.0"
-gentoo_package_keywords "=dev-ruby/mixlib-config-1.1.0"
+gentoo_package_keywords "=dev-ruby/mixlib-config-1.1.2"
 gentoo_package_keywords "=dev-ruby/mixlib-log-1.1.0"
 gentoo_package_keywords "=dev-ruby/moneta-0.6.0"
-gentoo_package_keywords "=dev-ruby/ohai-0.5.4"
-gentoo_package_keywords "=dev-ruby/rake-0.8.7-r4"
+gentoo_package_keywords "=dev-ruby/ohai-0.5.6"
+gentoo_package_keywords "=dev-ruby/rest-client-1.5.1"
+gentoo_package_keywords "=dev-ruby/rubygems-1.3.7-r1"
 gentoo_package_keywords "=dev-ruby/systemu-1.2.0"
-gentoo_package_keywords "=dev-util/ragel-6.6"
+gentoo_package_keywords "=dev-ruby/uuidtools-2.1.1-r1"
 
 package "app-admin/chef" do
   action :upgrade

chef/recipes/overlay.rb

@@ -2,7 +2,7 @@
 include_recipe "git::client"
 
 # TODO find out why the git resource syncs on every run
-chef_overlay_reference = "2beec328eba362f8a6ecd1b747fca747af0f4aa0"
+chef_overlay_reference = "2c7fa5adfc6937e767796d7945eb11c2a56f1fda"
 ref_file = "/usr/local/chef-overlay/.git/refs/heads/master"
 current_ref = File.size?(ref_file) ? File.read(ref_file).strip : ""
 

chef/recipes/server.rb

@@ -2,32 +2,27 @@
 include_recipe "couchdb"
 include_recipe "rabbitmq"
 
-gentoo_package_keywords "=app-admin/chef-solr-0.8.16"
-gentoo_package_keywords "=app-admin/chef-server-api-0.8.16"
-gentoo_package_keywords "=app-admin/chef-server-0.8.16"
-gentoo_package_keywords "=dev-ruby/coderay-0.9.2_pre455"
+gentoo_package_keywords "=app-admin/chef-server-0.9.0"
+gentoo_package_keywords "=app-admin/chef-server-api-0.9.0"
+gentoo_package_keywords "=app-admin/chef-server-webui-0.9.0"
+gentoo_package_keywords "=app-admin/chef-solr-0.9.0"
+gentoo_package_keywords "=dev-ruby/bundler-0.9.26"
+gentoo_package_keywords "=dev-ruby/coderay-0.9.3"
 gentoo_package_keywords "=dev-ruby/daemons-1.0.10-r1"
+gentoo_package_keywords "=dev-ruby/eventmachine-0.12.10-r2"
 gentoo_package_keywords "=dev-ruby/haml-2.2.24"
-gentoo_package_keywords "=dev-ruby/hoe-2.6.0-r1"
 gentoo_package_keywords "=dev-ruby/hpricot-0.8.2-r1"
-gentoo_package_keywords "=dev-ruby/json_pure-1.4.3"
-gentoo_package_keywords "=dev-ruby/libxml-1.1.3-r1"
-gentoo_package_keywords "=dev-ruby/merb-assets-1.0.15"
-gentoo_package_keywords "=dev-ruby/merb-core-1.0.15"
-gentoo_package_keywords "=dev-ruby/merb-haml-1.0.15"
-gentoo_package_keywords "=dev-ruby/merb-helpers-1.0.15"
-gentoo_package_keywords "=dev-ruby/merb-param-protection-1.0.15"
-gentoo_package_keywords "=dev-ruby/merb-slices-1.0.15"
-gentoo_package_keywords "=dev-ruby/mime-types-1.16-r2"
-gentoo_package_keywords "=dev-ruby/nokogiri-1.4.1-r1"
+gentoo_package_keywords "=dev-ruby/libxml-1.1.4"
+gentoo_package_keywords "=dev-ruby/merb-assets-1.1.2"
+gentoo_package_keywords "=dev-ruby/merb-core-1.1.2"
+gentoo_package_keywords "=dev-ruby/merb-haml-1.1.2"
+gentoo_package_keywords "=dev-ruby/merb-helpers-1.1.2"
+gentoo_package_keywords "=dev-ruby/merb-param-protection-1.1.2"
+gentoo_package_keywords "=dev-ruby/merb-slices-1.1.2"
 gentoo_package_keywords "=dev-ruby/rack-1.1.0"
+gentoo_package_keywords "=dev-ruby/rake-0.8.7-r5"
 gentoo_package_keywords "=dev-ruby/rake-compiler-0.7.0-r1"
-gentoo_package_keywords "=dev-ruby/rexical-1.0.4"
-gentoo_package_keywords "=dev-ruby/rspec-1.3.0"
 gentoo_package_keywords "=dev-ruby/ruby-openid-2.1.7-r1"
-gentoo_package_keywords "=dev-ruby/thor-0.13.6"
-gentoo_package_keywords "=dev-ruby/uuidtools-2.1.1-r1"
-gentoo_package_keywords "=dev-ruby/webrat-0.7.1"
 gentoo_package_keywords "=www-servers/thin-1.2.5-r1"
 
 refresh_required = false
@@ -38,14 +33,6 @@
   refresh_required = true
 end
 
-# for dev-ruby/json and dev-ruby/json_pure
-%w(/usr/bin/prettify_json.rb /usr/bin/edit_json.rb).each { |f|
-  unless node[:gentoo][:collision_ignores].include?(f)
-    node[:gentoo][:collision_ignores] << f
-    refresh_required = true
-  end
-}
-
 if refresh_required
   generate_make_conf "added chef requirements"
 end
@@ -86,6 +73,14 @@
   end
 }
 
+%w(checksums sandboxes).each { |d|
+  directory "/var/lib/chef/#{d}" do
+    owner "chef"
+    group "chef"
+    mode "0770"
+  end
+}
+
 %w(chef-solr chef-solr-indexer).each { |s|
   service s do
     supports :status => true, :restart => true
@@ -94,10 +89,10 @@
   end
 }
 
-service "chef-server" do
+service "chef-server-api" do
   supports :status => true, :restart => true
   action [ :enable, :start ]
-  subscribes :restart, resources(:package => "app-admin/chef-server", :package => "app-admin/chef-server-api", :template => "/etc/chef/server.rb")
+  subscribes :restart, resources(:package => "app-admin/chef-server-api", :template => "/etc/chef/server.rb")
 end
 
 http_request "compact chef couchDB" do

chef/recipes/webui.rb

@@ -19,7 +19,7 @@
 service "chef-server-webui" do
   supports :status => true, :restart => true
   action [ :enable, :start ]
-  subscribes :restart, resources(:package => "app-admin/chef-server-webui", :template => "/etc/chef/server.rb")
+  subscribes :restart, resources(:package => "app-admin/chef-server-webui", :template => "/etc/chef/webui.rb")
 end
 
 if node.recipe?("iptables")

chef/templates/default/chef-server.monit.erb

@@ -1,6 +1,6 @@
 check process chef-server with pidfile /var/run/chef/server.main.pid
-  start program = "/etc/init.d/chef-server start"
-  stop program = "/etc/init.d/chef-server stop"
+  start program = "/etc/init.d/chef-server-api start"
+  stop program = "/etc/init.d/chef-server-api stop"
   # if failed host localhost port 4000 protocol http
   #    with timeout 20 seconds
   #    then restart

chef/templates/default/nginx_server_proxy.conf.erb

@@ -13,5 +13,8 @@ server {
   location / {
     proxy_pass http://127.0.0.1:4000/;
     proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X_FORWARDED_PROTO https;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header Host $http_host;
   }
 }

chef/templates/default/server.rb.erb

@@ -128,6 +128,9 @@ signing_ca_path    "/etc/chef/certificates"
 signing_ca_cert    "/etc/chef/certificates/cert.pem"
 signing_ca_key     "/etc/chef/certificates/key.pem"
 
+sandbox_path       "/var/lib/chef/sandboxes"
+checksum_path      "/var/lib/chef/checksums"
+
 openid_store_path  "/var/lib/chef/openid/store"
 search_index_path  "/var/lib/chef/search_index"
 <% unless @amqp_pass.to_s == "" -%>

gentoo/attributes/gentoo.rb

@@ -1,41 +1,41 @@
-set_unless[:gentoo][:profile] = case node[:kernel][:machine]
+default[:gentoo][:profile] = case node[:kernel][:machine]
   when "x86_64"
     "default/linux/amd64/10.0"
   else
     "default/linux/#{node[:kernel][:machine]}/10.0"
   end
 
-set_unless[:gentoo][:use_flags] = [
+default[:gentoo][:use_flags] = [
   "-*", "berkdb", "bzip2", "cracklib", "crypt", "cxx", "fam", "gdbm",
   "glibc-omitfp", "gnutls", "iconv", "idn", "mmx", "modules", "mudflap",
   "multilib", "ncurses", "nls", "nptl", "nptlonly", "openmp", "pam",
   "pcre", "posix", "readline", "ruby", "sse", "sse2", "ssl", "sysfs",
   "sysvipc", "threads", "threadsafe", "unicode", "urandom", "xml", "zlib"
 ]
 
-set_unless[:gentoo][:cflags] = "-march=native -O2 -pipe"
-set_unless[:gentoo][:makeopts] = "-j#{node[:cpu][:total].to_i+1}"
+default[:gentoo][:cflags] = "-march=native -O2 -pipe"
+default[:gentoo][:makeopts] = "-j#{node[:cpu][:total].to_i+1}"
 
-set_unless[:gentoo][:portage_features] = %w(sandbox sfperms strict buildpkg parallel-fetch)
-set_unless[:gentoo][:emerge_options] = ["--verbose"] # + ["--jobs=3", "--load-average=3"]
-set_unless[:gentoo][:overlay_directories] = []
-set_unless[:gentoo][:collision_ignores] = []
-set_unless[:gentoo][:accept_licenses] = []
-set_unless[:gentoo][:ruby_targets] = ["ruby18"]
-set_unless[:gentoo][:use_expands] = {}
-set_unless[:gentoo][:elog_mailuri] = "" # "foo@example.com smtp.example.com"
-set_unless[:gentoo][:elog_mailfrom] = "portage@#{node[:fqdn]}"
-set_unless[:gentoo][:rsync_mirror] = "rsync://rsync.gentoo.org/gentoo-portage"
-set_unless[:gentoo][:distfile_mirrors] = ["http://gentoo.osuosl.org/"]
-set_unless[:gentoo][:portage_binhost] = ""
+default[:gentoo][:portage_features] = %w(sandbox sfperms strict buildpkg parallel-fetch)
+default[:gentoo][:emerge_options] = ["--verbose"] # + ["--jobs=3", "--load-average=3"]
+default[:gentoo][:overlay_directories] = []
+default[:gentoo][:collision_ignores] = []
+default[:gentoo][:accept_licenses] = []
+default[:gentoo][:ruby_targets] = ["ruby18"]
+default[:gentoo][:use_expands] = {}
+default[:gentoo][:elog_mailuri] = "" # "foo@example.com smtp.example.com"
+default[:gentoo][:elog_mailfrom] = "portage@#{node[:fqdn]}"
+default[:gentoo][:rsync_mirror] = "rsync://rsync.gentoo.org/gentoo-portage"
+default[:gentoo][:distfile_mirrors] = ["http://gentoo.osuosl.org/"]
+default[:gentoo][:portage_binhost] = ""
 
-set_unless[:gentoo][:hwtimezone] = "UTC" # "local"
-set_unless[:gentoo][:timezone] = "UTC" # "Europe/Budapest"
-set_unless[:gentoo][:synchwclock] = true # false
+default[:gentoo][:hwtimezone] = "UTC" # "local"
+default[:gentoo][:timezone] = "UTC" # "Europe/Budapest"
+default[:gentoo][:synchwclock] = true # false
 
-set_unless[:gentoo][:locales] = ["en_US ISO-8859-1", "en_US.UTF-8 UTF-8"]
+default[:gentoo][:locales] = ["en_US ISO-8859-1", "en_US.UTF-8 UTF-8"]
 
-set_unless[:gentoo][:sysctl] = {
+default[:gentoo][:sysctl] = {
   "kernel.panic" => 60,
   "kernel.shmmax" => 83886080,
   "net.ipv4.conf.all.rp_filter" => 1,

gentoo/recipes/default.rb

@@ -28,7 +28,7 @@
   variables(:hostname => node[:hostname])
 end
 
-remote_file "/etc/securetty" do
+cookbook_file "/etc/securetty" do
   source "securetty"
   owner "root"
   group "root"

gentoo/resources/package.rb

@@ -1,5 +1,5 @@
-def initialize(name, collection=nil, node=nil)
-  super(name, collection, node)
+def initialize(name, run_context=nil)
+  super(name, run_context)
   @action = :install
 end
 

gentoo/resources/package_keywords.rb

@@ -1,5 +1,5 @@
-def initialize(name, collection=nil, node=nil)
-  super(name, collection, node)
+def initialize(name, run_context=nil)
+  super(name, run_context)
   @action = :create
 end
 

gentoo/resources/package_mask.rb

@@ -1,5 +1,5 @@
-def initialize(name, collection=nil, node=nil)
-  super(name, collection, node)
+def initialize(name, run_context=nil)
+  super(name, run_context)
   @action = :create
 end
 

gentoo/resources/package_unmask.rb

@@ -1,5 +1,5 @@
-def initialize(name, collection=nil, node=nil)
-  super(name, collection, node)
+def initialize(name, run_context=nil)
+  super(name, run_context)
   @action = :create
 end
 

gentoo/resources/package_use.rb

@@ -1,5 +1,5 @@
-def initialize(name, collection=nil, node=nil)
-  super(name, collection, node)
+def initialize(name, run_context=nil)
+  super(name, run_context)
   @action = :create
 end
 

git/attributes/git.rb

@@ -1,2 +1,2 @@
-set_unless[:git][:client][:subverson] = false
-set_unless[:git][:client][:cvs] = false
+default[:git][:client][:subverson] = false
+default[:git][:client][:cvs] = false

iptables/recipes/default.rb

@@ -1,6 +1,6 @@
 gentoo_package "net-firewall/iptables"
 
-remote_file "/etc/conf.d/iptables" do
+cookbook_file "/etc/conf.d/iptables" do
   source "iptables.confd"
   owner "root"
   group "root"

iptables/resources/ban.rb

@@ -1,5 +1,5 @@
-def initialize(name, collection=nil, node=nil)
-  super(name, collection, node)
+def initialize(name, run_context=nil)
+  super(name, run_context)
   @action = :create
 end
 

iptables/resources/rule.rb

@@ -1,5 +1,5 @@
-def initialize(name, collection=nil, node=nil)
-  super(name, collection, node)
+def initialize(name, run_context=nil)
+  super(name, run_context)
   @action = :create
 end
 

logrotate/definitions/logrotate_config.rb

@@ -1,6 +1,6 @@
 define :logrotate_config, :enable => true, :source => nil do
   remote_source =  params[:source] || "#{params[:name]}.logrotate"
-  remote_file "/etc/logrotate.d/#{params[:name]}" do
+  cookbook_file "/etc/logrotate.d/#{params[:name]}" do
     source remote_source
     owner "root"
     group "root"

monit/attributes/monit.rb

@@ -1,3 +1,3 @@
-set_unless[:monit][:mailservers] = ["smtp.#{node[:domain]}"]
-set_unless[:monit][:alert_mail_from] = "monit@#{node[:fqdn]}"
-set_unless[:monit][:alert_mail_to] = "root@#{node[:domain]}"
+default[:monit][:mailservers] = ["smtp.#{node[:domain]}"]
+default[:monit][:alert_mail_from] = "monit@#{node[:fqdn]}"
+default[:monit][:alert_mail_to] = "root@#{node[:domain]}"

msmtp/attributes/msmtp.rb

@@ -1,4 +1,4 @@
-set_unless[:msmtp][:host] = "smtp.#{node[:domain]}"
-set_unless[:msmtp][:from] = "blackhole@#{node[:fqdn]}"
-set_unless[:msmtp][:user] = ""
-set_unless[:msmtp][:password] = ""
+default[:msmtp][:host] = "smtp.#{node[:domain]}"
+default[:msmtp][:from] = "blackhole@#{node[:fqdn]}"
+default[:msmtp][:user] = ""
+default[:msmtp][:password] = ""

mysql/attributes/mysql.rb

@@ -1,20 +1,20 @@
-set_unless[:mysql][:root_password] = ""
-set_unless[:mysql][:server_address] = "localhost"
-set_unless[:mysql][:client_ips] = %w(127.0.0.1)
-set_unless[:mysql][:encoding] = "utf8"
-set_unless[:mysql][:server][:mode] = "standalone" # || "master" || "slave"
+default[:mysql][:root_password] = ""
+default[:mysql][:server_address] = "localhost"
+default[:mysql][:client_ips] = %w(127.0.0.1)
+default[:mysql][:encoding] = "utf8"
+default[:mysql][:server][:mode] = "standalone" # || "master" || "slave"
 
 # http://dev.mysql.com/doc/refman/5.0/en/replication-options.html#option_mysqld_server-id
-set_unless[:mysql][:server][:id] = node[:ipaddress].gsub(".", "").to_i % 4294967295 # hopefully unique
+default[:mysql][:server][:id] = node[:ipaddress].gsub(".", "").to_i % 4294967295 # hopefully unique
 
 # http://dev.mysql.com/doc/refman/5.0/en/server-options.html#option_mysqld_bind-address
-set_unless[:mysql][:server][:bind_address] = "127.0.0.1"
+default[:mysql][:server][:bind_address] = "127.0.0.1"
 
 # http://dev.mysql.com/doc/refman/5.0/en/server-system-variables.html#sysvar_max_connections
-set_unless[:mysql][:server][:max_connections] = 100
+default[:mysql][:server][:max_connections] = 100
 
 # misc variables
-set_unless[:mysql][:server][:mysqld_variables] = {
+default[:mysql][:server][:mysqld_variables] = {
   "join_buffer_size" => "4M",
   "key_buffer" => "192M",
   "max_allowed_packet" => "32M",

mysql/resources/database.rb

@@ -1,6 +1,6 @@
 # http://dev.mysql.com/doc/refman/5.0/en/create-database.html
-def initialize(name, collection=nil, node=nil)
-  super(name, collection, node)
+def initialize(name, run_context=nil)
+  super(name, run_context)
   @action = :create
 end
 

mysql/resources/grant.rb

@@ -1,6 +1,6 @@
 # http://dev.mysql.com/doc/refman/5.0/en/grant.html
-def initialize(name, collection=nil, node=nil)
-  super(name, collection, node)
+def initialize(name, run_context=nil)
+  super(name, run_context)
   @action = :create
 end