better handling for radiant rails environment

chef-boneyard · May 22, 2011 · ee3b69d · ee3b69d
1 parent edd2d5d
commit ee3b69d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/radiant/attributes/default.rb b/radiant/attributes/default.rb
@@ -21,11 +21,12 @@
 default['radiant']['branch']          = "HEAD"
 default['radiant']['migrate']         = false
 default['radiant']['migrate_command'] = "rake db:migrate"
-default['radiant']['revision']        = "HEAD"
-default['radiant']['action']          = "nothing"
-default['radiant']['edge']            = false
-default['radiant']['db_bootstrap']    = <<EOS
-yes | rake #{node.chef_environment} db:bootstrap \
+default['radiant']['revision']     = "HEAD"
+default['radiant']['action']       = "nothing"
+default['radiant']['edge']         = false
+default['radiant']['environment']  = node.chef_environment =~ /_default/ ? "production" : node.chef_environment
+default['radiant']['db_bootstrap'] = <<EOS
+yes | rake #{node['radiant']['environment']} db:bootstrap \
 ADMIN_NAME=Administrator \
 ADMIN_USERNAME=admin \
 ADMIN_PASSWORD=radiant \

diff --git a/radiant/recipes/default.rb b/radiant/recipes/default.rb
@@ -59,5 +59,5 @@
   template "#{appname}.conf.erb"
   server_name "#{appname}.#{node[:domain]}"
   server_aliases [ "#{appname}", node[:hostname] ]
-  rails_env node.chef_environment
+  rails_env node['radiant']['environment']
 end