Remove all the Proc hacks since I know a bit more about how defaults work now.

Author: Danial Pearce

attributes/default.rb

@@ -1,15 +1,9 @@
 default['unicorn']['installs'] = []
-default['unicorn']['rack_env'] = 'production'
-default['unicorn']['user']     = 'root'
-default['unicorn']['group']    = 'root'
-default['unicorn']['pid']      = Proc.new{|root| "#{root}/tmp/pids/unicorn.pid" }
-default['unicorn']['service']  = Proc.new{|env| "unicorn-#{env}" }
-default['unicorn']['command']  = Proc.new{|root, env, config| "cd #{root} && bundle exec unicorn_rails -D -E #{env} -c #{config}" }
 
 default['unicorn']['config']['generate']          = true
-default['unicorn']['config']['path']              = Proc.new{|root| "#{root}/config/unicorn.rb" }
-default['unicorn']['config']['stderr_path']       = Proc.new{|root| "#{root}/log/unicorn.log"   }
-default['unicorn']['config']['stdout_path']       = Proc.new{|root| "#{root}/log/unicorn.log"   }
+default['unicorn']['config']['path']              = "#{node['unicorn']['app_root']}/config/unicorn.rb"
+default['unicorn']['config']['stderr_path']       = "#{node['unicorn']['app_root']}/log/unicorn.log"
+default['unicorn']['config']['stdout_path']       = "#{node['unicorn']['app_root']}/log/unicorn.log"
 default['unicorn']['config']['listen']            = [['3000', '{ :tcp_nodelay => true, :tries => 5 }']]
 default['unicorn']['config']['working_directory'] = nil
 default['unicorn']['config']['worker_timeout']    = 60
@@ -18,3 +12,10 @@
 default['unicorn']['config']['before_exec']       = nil
 default['unicorn']['config']['before_fork']       = nil
 default['unicorn']['config']['after_fork']        = nil
+
+default['unicorn']['rack_env'] = 'production'
+default['unicorn']['user']     = 'root'
+default['unicorn']['group']    = 'root'
+default['unicorn']['pid']      = "#{node['unicorn']['app_root']}/tmp/pids/unicorn.pid"
+default['unicorn']['service']  = "unicorn-#{node['unicorn']['rack_env']}"
+default['unicorn']['command']  = "cd #{node['unicorn']['app_root']} && bundle exec unicorn_rails -D -E #{node['unicorn']['rack_env']} -c #{node['unicorn']['config']['path']}"

recipes/default.rb

@@ -1,5 +1,10 @@
 node['unicorn']['installs'].each do |install|
-  # Make sure the install defaults come across for each unicorn install
+
+  # Since a lot of defaults rely on app_root, set it and reload defeaults
+  node.set['unicorn']['app_root'] = install['app_root']
+  node.load_attribute_by_short_filename('default', 'unicorn')
+
+  # Apply the defaults for each unicorn install
   install['config'] ||= {}
   %w(rack_env user group pid service command).each do |k|
     install[k] ||= node['unicorn'][k]
@@ -8,49 +13,34 @@
     install['config'][k] ||= node['unicorn']['config'][k]
   end
 
-  # installure defaults, tricky since some defaults are dependant on others and we have interpolation!
-  parsed_pid         = install['pid']    .is_a?(Proc) ? install['pid']    .call(install['app_root']) : install['pid']
-  parsed_service     = install['service'].is_a?(Proc) ? install['service'].call(install['rack_env']) : install['service']
-  parsed_config      = install['config']['path']       .is_a?(Proc) ? install['config']['path']       .call(install['app_root']) : install['config']['path']
-  parsed_stdout_path = install['config']['stdout_path'].is_a?(Proc) ? install['config']['stdout_path'].call(install['app_root']) : install['config']['stdout_path']
-  parsed_stderr_path = install['config']['stderr_path'].is_a?(Proc) ? install['config']['stderr_path'].call(install['app_root']) : install['config']['stderr_path']
-  parsed_command     = install['command'].is_a?(Proc) ? install['command'].call(install['app_root'], install['rack_env'], parsed_config) : install['command']
-
-  # Setup the boot time flags
-  bash "update-rc.d #{parsed_service} defaults" do
-    user 'root'
-    code "update-rc.d #{parsed_service} defaults"
-    action :nothing
-  end
-
   # Create the init.d script
-  template "/etc/init.d/#{parsed_service}" do
+  template "/etc/init.d/#{install['service']}" do
     source 'unicorn.erb'
     variables(
       :root    => install['app_root'],
       :env     => install['rack_env'],
       :user    => install['user'],
-      :pid     => parsed_pid,
-      :command => parsed_command
+      :pid     => install['pid'],
+      :command => install['command']
     )
     mode '775'
-    notifies :run, resources(:bash => "update-rc.d #{parsed_service} defaults")
   end
 
-  # Setup the chef service
-  service parsed_service do
+  # Setup the service to run at boot. We can't start it yet cos no config,
+  # but we need to enable it so the config can notify the restarter.
+  service install['service'] do
     supports [:start, :restart, :reload, :stop, :status]
     action :enable
   end
 
   # Create the install if necessary
-  template parsed_config do
+  template install['config']['path'] do
     only_if   { install['config']['generate'] }
     source    'config.rb.erb'
     user      install['user']
     group     install['group']
     variables(
-      :identifier        => parsed_service,
+      :identifier        => install['service'],
       :listen            => install['config']['listen'],
       :user              => install['user'],
       :group             => install['group'],
@@ -61,15 +51,16 @@
       :before_exec       => install['config']['before_exec'],
       :before_fork       => install['config']['before_fork'],
       :after_fork        => install['config']['after_fork'],
-      :pid               => parsed_pid,
-      :stderr_path       => parsed_stderr_path,
-      :stdout_path       => parsed_stdout_path
+      :pid               => install['pid'],
+      :stderr_path       => install['config']['stderr_path'],
+      :stdout_path       => install['config']['stdout_path']
     )
     mode '755'
-    notifies :restart, resources(:service => parsed_service), :delayed
+    notifies :restart, resources(:service => install['service']), :delayed
   end
 
-  service parsed_service do
+  # Start 'er up.
+  service install['service'] do
     action :start
   end
 end