From 93aedac7245f44a553d9a026e1a058650b8c6993 Mon Sep 17 00:00:00 2001
From: jtimberman <joshua@opscode.com>
Date: Thu, 19 May 2011 16:41:54 -0600
Subject: [PATCH] use chef 0.10.0 environments

* Replaces all occurrances of node app_environment attribute with
node.chef_environment in recipes.
* Still need to update readmes for using environments instead of roles.
---
 application/recipes/django.rb                 | 18 +++---
 application/recipes/java_webapp.rb            | 18 +++---
 application/recipes/passenger_apache2.rb      |  2 +-
 application/recipes/php.rb                    | 12 ++--
 application/recipes/rails.rb                  | 39 ++++-------
 application/templates/default/context.xml.erb |  2 +-
 .../templates/default/sv-unicorn-run.erb      |  2 +-
 database/recipes/ebs_backup.rb                |  4 +-
 database/recipes/ebs_volume.rb                | 22 +++----
 database/recipes/master.rb                    |  8 +--
 haproxy/recipes/app_lb.rb                     |  4 +-
 munin/recipes/client.rb                       |  4 +-
 munin/recipes/server.rb                       | 26 ++++----
 munin/templates/default/apache2.conf.erb      |  2 +-
 nagios/recipes/client.rb                      |  2 +-
 nagios/recipes/server.rb                      |  4 +-
 nagios/templates/default/apache2.conf.erb     |  2 +-
 radiant/recipes/db_bootstrap.rb               |  2 +-
 radiant/recipes/default.rb                    | 64 ++++---------------
 19 files changed, 91 insertions(+), 146 deletions(-)

diff --git a/application/recipes/django.rb b/application/recipes/django.rb
index c3d882d04..78f330611 100644
--- a/application/recipes/django.rb
+++ b/application/recipes/django.rb
@@ -1,6 +1,6 @@
 #
 # Cookbook Name:: application
-# Recipe:: wsgi
+# Recipe:: django
 #
 # Copyright 2011, Opscode, Inc.
 #
@@ -26,7 +26,7 @@
 # default application recipe work it's mojo for you.
 ###
 
-node.default[:apps][app['id']][node.app_environment][:run_migrations] = false
+node.default[:apps][app['id']][node.chef_environment][:run_migrations] = false
 
 # the Django split-settings file name varies from project to project...+1 for standardization
 local_settings_full_path = app['local_settings_file'] || 'settings_local.py'
@@ -107,7 +107,7 @@
     dbm = node
   else
   # Find the database master
-    results = search(:node, "run_list:role\\[#{app["database_master_role"][0]}\\] AND app_environment:#{node[:app_environment]}", nil, 0, 1)
+    results = search(:node, "run_list:role\\[#{app["database_master_role"][0]}\\] AND chef_environment:#{node.chef_environment}", nil, 0, 1)
     rows = results[0]
     if rows.length == 1
       dbm = rows[0]
@@ -130,7 +130,7 @@
       mode "644"
       variables(
         :host => dbm['fqdn'],
-        :database => app['databases'][node.app_environment],
+        :database => app['databases'][node.chef_environment],
         :django_version => django_version
       )
     end
@@ -141,12 +141,12 @@
 
 ## Then, deploy
 deploy_revision app['id'] do
-  revision app['revision'][node.app_environment]
+  revision app['revision'][node.chef_environment]
   repository app['repository']
   user app['owner']
   group app['group']
   deploy_to app['deploy_to']
-  action app['force'][node.app_environment] ? :force_deploy : :deploy
+  action app['force'][node.chef_environment] ? :force_deploy : :deploy
   ssh_wrapper "#{app['deploy_to']}/deploy-ssh-wrapper" if app['deploy_key']
   shallow_clone true
   purge_before_symlink([])
@@ -155,8 +155,8 @@
   before_migrate do
     requirements_file = nil
     # look for requirements.txt files in common locations
-    if ::File.exists?(::File.join(release_path, "requirements", "#{node[:app_environment]}.txt"))
-      requirements_file = ::File.join(release_path, "requirements", "#{node[:app_environment]}.txt")
+    if ::File.exists?(::File.join(release_path, "requirements", "#{node[:chef_environment]}.txt"))
+      requirements_file = ::File.join(release_path, "requirements", "#{node.chef_environment}.txt")
     elsif ::File.exists?(::File.join(release_path, "requirements.txt"))
       requirements_file = ::File.join(release_path, "requirements.txt")
     end
@@ -174,7 +174,7 @@
     local_settings_file_name => local_settings_full_path
   })
 
-  if app['migrate'][node.app_environment] && node[:apps][app['id']][node.app_environment][:run_migrations]
+  if app['migrate'][node.chef_environment] && node[:apps][app['id']][node.chef_environment][:run_migrations]
     migrate true
     migration_command app['migration_command'] || "#{::File.join(ve.path, "bin", "python")} manage.py migrate"
   else
diff --git a/application/recipes/java_webapp.rb b/application/recipes/java_webapp.rb
index 11f43c973..3c9a03761 100644
--- a/application/recipes/java_webapp.rb
+++ b/application/recipes/java_webapp.rb
@@ -1,8 +1,8 @@
 #
 # Cookbook Name:: application
-# Recipe:: java
+# Recipe:: java_webapp
 #
-# Copyright 2010, Opscode, Inc.
+# Copyright 2010-2011, Opscode, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
 # default application recipe work it's mojo for you.
 ###
 
-node.default[:apps][app['id']][node.app_environment][:run_migrations] = false
+node.default[:apps][app['id']][node.chef_environment][:run_migrations] = false
 
 ## First, install any application specific packages
 if app['packages']
@@ -75,7 +75,7 @@
     dbm = node
   else
   # Find the database master
-    results = search(:node, "run_list:role\\[#{app["database_master_role"][0]}\\] AND app_environment:#{node[:app_environment]}", nil, 0, 1)
+    results = search(:node, "run_list:role\\[#{app["database_master_role"][0]}\\] AND chef_environment:#{node.chef_environment}", nil, 0, 1)
     rows = results[0]
     if rows.length == 1
       dbm = rows[0]
@@ -92,8 +92,8 @@
       variables(
         :host => dbm['fqdn'],
         :app => app['id'],
-        :database => app['databases'][node.app_environment],
-        :war => "#{app['deploy_to']}/releases/#{app['war'][node.app_environment]['checksum']}.war"
+        :database => app['databases'][node.chef_environment],
+        :war => "#{app['deploy_to']}/releases/#{app['war'][node.chef_environment]['checksum']}.war"
       )
     end
   end
@@ -101,8 +101,8 @@
 
 ## Then, deploy
 remote_file app['id'] do
-  path "#{app['deploy_to']}/releases/#{app['war'][node.app_environment]['checksum']}.war"
-  source app['war'][node.app_environment]['source']
+  path "#{app['deploy_to']}/releases/#{app['war'][node.chef_environment]['checksum']}.war"
+  source app['war'][node.chef_environment]['source']
   mode "0644"
-  checksum app['war'][node.app_environment]['checksum']
+  checksum app['war'][node.chef_environment]['checksum']
 end
diff --git a/application/recipes/passenger_apache2.rb b/application/recipes/passenger_apache2.rb
index 8915bf599..690305af9 100644
--- a/application/recipes/passenger_apache2.rb
+++ b/application/recipes/passenger_apache2.rb
@@ -37,7 +37,7 @@
   server_name "#{app['id']}.#{node[:domain]}"
   server_aliases server_aliases
   log_dir node[:apache][:log_dir]
-  rails_env node.app_environment
+  rails_env node.chef_environment
 end
 
 if ::File.exists?(::File.join(app['deploy_to'], "current"))
diff --git a/application/recipes/php.rb b/application/recipes/php.rb
index 2fb04b60b..3db5a8bcd 100644
--- a/application/recipes/php.rb
+++ b/application/recipes/php.rb
@@ -26,7 +26,7 @@
 # default application recipe work it's mojo for you.
 ###
 
-node.default['apps'][app['id']][node.app_environment]['run_migrations'] = false
+node.default['apps'][app['id']][node.chef_environment]['run_migrations'] = false
 
 # the PHP projects have no standard local settings file name..or path in the project
 local_settings_full_path = app['local_settings_file'] || 'LocalSettings.php'
@@ -98,7 +98,7 @@
     dbm = node
   else
   # Find the database master
-    results = search(:node, "run_list:role\\[#{app['database_master_role'][0]}\\] AND app_environment:#{node['app_environment']}", nil, 0, 1)
+    results = search(:node, "run_list:role\\[#{app['database_master_role'][0]}\\] AND chef_environment:#{node.chef_environment}", nil, 0, 1)
     rows = results[0]
     if rows.length == 1
       dbm = rows[0]
@@ -116,7 +116,7 @@
       variables(
         :path => "#{app['deploy_to']}/current",
         :host => dbm['fqdn'],
-        :database => app['databases'][node['app_environment']],
+        :database => app['databases'][node.chef_environment],
         :app => app
       )
     end
@@ -127,12 +127,12 @@
 
 ## Then, deploy
 deploy_revision app['id'] do
-  revision app['revision'][node.app_environment]
+  revision app['revision'][node.chef_environment]
   repository app['repository']
   user app['owner']
   group app['group']
   deploy_to app['deploy_to']
-  action app['force'][node.app_environment] ? :force_deploy : :deploy
+  action app['force'][node.chef_environment] ? :force_deploy : :deploy
   ssh_wrapper "#{app['deploy_to']}/deploy-ssh-wrapper" if app['deploy_key']
   shallow_clone true
   purge_before_symlink([])
@@ -141,4 +141,4 @@
   symlink_before_migrate({
     local_settings_file_name => local_settings_full_path
   })
-end
\ No newline at end of file
+end
diff --git a/application/recipes/rails.rb b/application/recipes/rails.rb
index f815fde11..2373dc15e 100644
--- a/application/recipes/rails.rb
+++ b/application/recipes/rails.rb
@@ -2,7 +2,7 @@
 # Cookbook Name:: application
 # Recipe:: rails
 #
-# Copyright 2009, Opscode, Inc.
+# Copyright 2009-2011, Opscode, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -24,13 +24,7 @@
 # default application recipe work it's mojo for you.
 ###
 
-# Are we using REE?
-use_ree = false
-if node.run_state[:seen_recipes].has_key?("ruby_enterprise")
-  use_ree = true
-end
-
-node.default[:apps][app['id']][node.app_environment][:run_migrations] = false
+node.default[:apps][app['id']][node.chef_environment][:run_migrations] = false
 
 ## First, install any application specific packages
 if app['packages']
@@ -45,16 +39,9 @@
 ## Next, install any application specific gems
 if app['gems']
   app['gems'].each do |gem,ver|
-    if use_ree
-      ree_gem gem do
-        action :install
-        version ver if ver && ver.length > 0
-      end
-    else
-      gem_package gem do
-        action :install
-        version ver if ver && ver.length > 0
-      end
+    gem_package gem do
+      action :install
+      version ver if ver && ver.length > 0
     end
   end
 end
@@ -116,7 +103,7 @@
     dbm = node
   else
   # Find the database master
-    results = search(:node, "run_list:role\\[#{app["database_master_role"][0]}\\] AND app_environment:#{node[:app_environment]}", nil, 0, 1)
+    results = search(:node, "run_list:role\\[#{app["database_master_role"][0]}\\] AND chef_environment:#{node.chef_environment}", nil, 0, 1)
     rows = results[0]
     if rows.length == 1
       dbm = rows[0]
@@ -141,7 +128,7 @@
 end
 
 if app["memcached_role"]
-  results = search(:node, "role:#{app["memcached_role"][0]} AND app_environment:#{node[:app_environment]} NOT hostname:#{node[:hostname]}")
+  results = search(:node, "role:#{app["memcached_role"][0]} AND chef_environment:#{node.chef_environment} NOT hostname:#{node[:hostname]}")
   if results.length == 0
     if node.run_list.roles.include?(app["memcached_role"][0])
       results << node
@@ -161,13 +148,13 @@
 
 ## Then, deploy
 deploy_revision app['id'] do
-  revision app['revision'][node.app_environment]
+  revision app['revision'][node.chef_environment]
   repository app['repository']
   user app['owner']
   group app['group']
   deploy_to app['deploy_to']
-  environment 'RAILS_ENV' => node.app_environment
-  action app['force'][node.app_environment] ? :force_deploy : :deploy
+  environment 'RAILS_ENV' => node.chef_environment
+  action app['force'][node.chef_environment] ? :force_deploy : :deploy
   ssh_wrapper "#{app['deploy_to']}/deploy-ssh-wrapper" if app['deploy_key']
   shallow_clone true
   before_migrate do
@@ -176,7 +163,7 @@
         to "#{app['deploy_to']}/shared/vendor_bundle"
       end
       common_groups = %w{development test cucumber staging production}
-      execute "bundle install --deployment --without #{(common_groups -([node.app_environment])).join(' ')}" do
+      execute "bundle install --deployment --without #{(common_groups -([node.chef_environment])).join(' ')}" do
         ignore_failure true
         cwd release_path
       end
@@ -186,7 +173,7 @@
         cwd release_path
       end
 
-    elsif node.app_environment && app['databases'].has_key?(node.app_environment)
+    elsif node.chef_environment && app['databases'].has_key?(node.chef_environment)
       # chef runs before_migrate, then symlink_before_migrate symlinks, then migrations,
       # yet our before_migrate needs database.yml to exist (and must complete before
       # migrations).
@@ -205,7 +192,7 @@
     "memcached.yml" => "config/memcached.yml"
   })
 
-  if app['migrate'][node.app_environment] && node[:apps][app['id']][node.app_environment][:run_migrations]
+  if app['migrate'][node.chef_environment] && node[:apps][app['id']][node.chef_environment][:run_migrations]
     migrate true
     migration_command app['migration_command'] || "rake db:migrate"
   else
diff --git a/application/templates/default/context.xml.erb b/application/templates/default/context.xml.erb
index e09dcdd4d..d6301af51 100644
--- a/application/templates/default/context.xml.erb
+++ b/application/templates/default/context.xml.erb
@@ -1,6 +1,6 @@
 <Context docBase="<%= @war %>" path="/"
         debug="5" reloadable="true" crossContext="true" allowLinking="true">
-  <Environment name="appEnvironment" value="<%= node['app_environment'] %>"
+  <Environment name="appEnvironment" value="<%= node.chef_environment %>"
           type="java.lang.String" override="false"/>
   <Resource name="jdbc/<%= @app %>" auth="Container" type="javax.sql.DataSource"
                maxActive="<%= @database['max_active'] %>" maxIdle="<%= @database['max_idle'] %>" maxWait="<%= @database['max_wait'] %>"
diff --git a/application/templates/default/sv-unicorn-run.erb b/application/templates/default/sv-unicorn-run.erb
index f36b73e85..71a08a28e 100644
--- a/application/templates/default/sv-unicorn-run.erb
+++ b/application/templates/default/sv-unicorn-run.erb
@@ -3,5 +3,5 @@
 cd <%= @options[:app]['deploy_to'] %>/current
 
 exec 2>&1
-exec chpst -u <%= @options[:app]["owner"] %>:<%= @options[:app]["group"] %> <%= @options[:smells_like_rack] ? 'unicorn' : 'unicorn_rails' %> -E <%= node[:app_environment] %> -c /etc/unicorn/<%= @options[:app]['id'] %>.rb
+exec chpst -u <%= @options[:app]["owner"] %>:<%= @options[:app]["group"] %> <%= @options[:smells_like_rack] ? 'unicorn' : 'unicorn_rails' %> -E <%= node.chef_environment %> -c /etc/unicorn/<%= @options[:app]['id'] %>.rb
 
diff --git a/database/recipes/ebs_backup.rb b/database/recipes/ebs_backup.rb
index f473fa867..7a2f8a2b0 100644
--- a/database/recipes/ebs_backup.rb
+++ b/database/recipes/ebs_backup.rb
@@ -35,7 +35,7 @@
   db_master_role = app["database_master_role"]
 end
 
-ebs_info = Chef::DataBagItem.load(:aws, "ebs_#{db_master_role}_#{node['app_environment']}")
+ebs_info = Chef::DataBagItem.load(:aws, "ebs_#{db_master_role}_#{node.chef_environment}")
 
 gem_package "dbi"
 gem_package "dbd-mysql"
@@ -78,7 +78,7 @@
   end
 end
 
-if db_type == "master" && node['app_environment'] == "production"
+if db_type == "master" && node.chef_environment == "production"
   template "/etc/cron.d/db-backup" do
     source "ebs-backup-cron.erb"
     owner "root"
diff --git a/database/recipes/ebs_volume.rb b/database/recipes/ebs_volume.rb
index 866be5dea..7b50f3b61 100644
--- a/database/recipes/ebs_volume.rb
+++ b/database/recipes/ebs_volume.rb
@@ -44,8 +44,8 @@
     if (app["database_master_role"] & node.run_list.roles).length == 1 || (app["database_slave_role"] & node.run_list.roles).length == 1
       master_role = app["database_master_role"]
       slave_role = app["database_slave_role"]
-      root_pw = app["mysql_root_password"][node.app_environment]
-      snapshots_to_keep = app["snapshots_to_keep"][node.app_environment]
+      root_pw = app["mysql_root_password"][node.chef_environment]
+      snapshots_to_keep = app["snapshots_to_keep"][node.chef_environment]
 
       if (master_role & node.run_list.roles).length == 1
         db_type = "master"
@@ -60,27 +60,27 @@
   end
 
   begin
-    ebs_info = Chef::DataBagItem.load(:aws, "ebs_#{db_role}_#{node[:app_environment]}")
+    ebs_info = Chef::DataBagItem.load(:aws, "ebs_#{db_role}_#{node.chef_environment}")
     Chef::Log.info("Loaded #{ebs_info['volume_id']} from DataBagItem aws[#{ebs_info['id']}]")
   rescue
-    Chef::Log.warn("Could not find the 'ebs_#{db_role}_#{node[:app_environment]}' item in the 'aws' data bag")
+    Chef::Log.warn("Could not find the 'ebs_#{db_role}_#{node.chef_environment}' item in the 'aws' data bag")
     ebs_info = Hash.new
   end
 
   begin
-    master_info = Chef::DataBagItem.load(:aws, "ebs_#{master_role}_#{node.app_environment}")
+    master_info = Chef::DataBagItem.load(:aws, "ebs_#{master_role}_#{node.chef_environment}")
     Chef::Log.info "Loaded #{master_info['volume_id']} from DataBagItem aws[#{master_info['id']}]"
   rescue
     Chef::Application.fatal! "Could not load replication masters snapshot details", -41 if db_type == "slave"
   end
 
-  ruby_block "store_#{db_role}_#{node[:app_environment]}_volid" do
+  ruby_block "store_#{db_role}_#{node.chef_environment}_volid" do
     block do
-      ebs_vol_id = node[:aws][:ebs_volume]["#{db_role}_#{node[:app_environment]}"][:volume_id]
+      ebs_vol_id = node[:aws][:ebs_volume]["#{db_role}_#{node.chef_environment}"][:volume_id]
 
       unless ebs_info['volume_id']
         item = {
-          "id" => "ebs_#{db_role}_#{node[:app_environment]}",
+          "id" => "ebs_#{db_role}_#{node.chef_environment}",
           "volume_id" => ebs_vol_id
         }
         Chef::Log.info "Storing volume_id #{item.inspect}"
@@ -94,7 +94,7 @@
     action :nothing
   end
 
-  aws_ebs_volume "#{db_role}_#{node[:app_environment]}" do
+  aws_ebs_volume "#{db_role}_#{node.chef_environment}" do
     aws_access_key aws['aws_access_key_id']
     aws_secret_access_key aws['aws_secret_access_key']
     size 50
@@ -111,7 +111,7 @@
       else
         action [ :create, :attach ]
       end
-      notifies :create, resources(:ruby_block => "store_#{db_role}_#{node[:app_environment]}_volid")
+      notifies :create, resources(:ruby_block => "store_#{db_role}_#{node.chef_environment}_volid")
     when "slave"
       if master_info['volume_id']
         snapshot_id master_info['volume_id']
@@ -141,7 +141,7 @@
           'db_snapshot' => {
             'ebs_vol_dev' => node.mysql.ec2_path,
             'db_role' => db_role,
-            'app_environment' => node.app_environment,
+            'app_environment' => node.chef_environment,
             'username' => 'root',
             'password' => root_pw,
             'aws_access_key_id' => aws['aws_access_key_id'],
diff --git a/database/recipes/master.rb b/database/recipes/master.rb
index d2450846b..d43d22dcd 100644
--- a/database/recipes/master.rb
+++ b/database/recipes/master.rb
@@ -31,12 +31,12 @@
   (app['database_master_role'] & node.run_list.roles).each do |dbm_role|
     %w{ root repl debian }.each do |user|
       user_pw = app["mysql_#{user}_password"]
-      if !user_pw.nil? and user_pw[node.app_environment]
+      if !user_pw.nil? and user_pw[node.chef_environment]
         Chef::Log.debug("Saving password for #{user} as node attribute node['mysql']['server_#{user}_password'")
-        node.set['mysql']["server_#{user}_password"] = user_pw[node.app_environment]
+        node.set['mysql']["server_#{user}_password"] = user_pw[node.chef_environment]
         node.save
       else
-        log "A password for MySQL user #{user} was not found in DataBag 'apps' item '#{app["id"]}' for environment ' for #{node.app_environment}'." do
+        log "A password for MySQL user #{user} was not found in DataBag 'apps' item '#{app["id"]}' for environment ' for #{node.chef_environment}'." do
           level :warn
         end
         log "A random password will be generated by the mysql cookbook and added as 'node.mysql.server_#{user}_password'. Edit the DataBag item to ensure it is set correctly on new nodes" do
@@ -79,7 +79,7 @@
 search(:apps) do |app|
   (app['database_master_role'] & node.run_list.roles).each do |dbm_role|
     app['databases'].each do |env,db|
-      if env =~ /#{node['app_environment']}/
+      if env =~ /#{node.chef_environment}/
         root_pw = node['mysql']['server_root_password']
         mysql_database "create #{db['database']}" do
           host "localhost"
diff --git a/haproxy/recipes/app_lb.rb b/haproxy/recipes/app_lb.rb
index 5431bbf90..7ce582a73 100644
--- a/haproxy/recipes/app_lb.rb
+++ b/haproxy/recipes/app_lb.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+pool_members = search("node", "role:#{node['haproxy']['app_server_role']} AND chef_environment:#{node.chef_environment}") || []
+
 package "haproxy" do
   action :install
 end
@@ -33,8 +35,6 @@
   action [:enable, :start]
 end
 
-pool_members = search("node", "role:#{node['haproxy']['app_server_role']} AND app_environment:#{node['app_environment']}") || []
-
 template "/etc/haproxy/haproxy.cfg" do
   source "haproxy-app_lb.cfg.erb"
   owner "root"
diff --git a/munin/recipes/client.rb b/munin/recipes/client.rb
index 52dc4dd8a..9dd8728ad 100644
--- a/munin/recipes/client.rb
+++ b/munin/recipes/client.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+munin_servers = search(:node, "role:#{node['munin']['server_role']} AND chef_environment:#{node.chef_environment}")
+
 package "munin-node"
 
 service "munin-node" do
@@ -24,8 +26,6 @@
   action :enable
 end
 
-munin_servers = search(:node, "role:#{node['munin']['server_role']} AND app_environment:#{node['app_environment']}")
-
 template "/etc/munin/munin-node.conf" do
   source "munin-node.conf.erb"
   mode 0644
diff --git a/munin/recipes/server.rb b/munin/recipes/server.rb
index 7e9a2f355..16e59387d 100644
--- a/munin/recipes/server.rb
+++ b/munin/recipes/server.rb
@@ -17,6 +17,19 @@
 # limitations under the License.
 #
 
+munin_servers = search(:node, "munin:[* TO *] AND chef_environment:#{node.chef_environment}")
+
+if node[:public_domain]
+  case node.chef_environment
+  when "production"
+    public_domain = node[:public_domain]
+  else
+    public_domain = "#{node.chef_environment}.#{node[:public_domain]}"
+  end
+else
+  public_domain = node[:domain]
+end
+
 include_recipe "apache2"
 include_recipe "apache2::mod_auth_openid"
 include_recipe "apache2::mod_rewrite"
@@ -41,19 +54,6 @@
   end
 end
 
-munin_servers = search(:node, "munin:[* TO *] AND role:#{node[:app_environment]}")
-
-if node[:public_domain]
-  case node[:app_environment]
-  when "production"
-    public_domain = node[:public_domain]
-  else
-    public_domain = "#{node[:app_environment]}.#{node[:public_domain]}"
-  end
-else
-  public_domain = node[:domain]
-end
-
 template "/etc/munin/munin.conf" do
   source "munin.conf.erb"
   mode 0644
diff --git a/munin/templates/default/apache2.conf.erb b/munin/templates/default/apache2.conf.erb
index 8a6045595..ac90601c3 100644
--- a/munin/templates/default/apache2.conf.erb
+++ b/munin/templates/default/apache2.conf.erb
@@ -1,7 +1,7 @@
 <VirtualHost *:80>
   ServerAdmin     ops@example.com
   ServerName      <%= node[:fqdn] %>
-	ServerAlias     munin munin.<%= node[:app_environment] %>.<%= @public_domain %>
+	ServerAlias     munin munin.<%= node.chef_environment %>.<%= @public_domain %>
 <% case node[:platform] -%>
 <% when "arch" -%>
   Alias /munin /srv/http/munin
diff --git a/nagios/recipes/client.rb b/nagios/recipes/client.rb
index 95867e17f..28cb953ae 100644
--- a/nagios/recipes/client.rb
+++ b/nagios/recipes/client.rb
@@ -25,7 +25,7 @@
 if node.run_list.roles.include?(node[:nagios][:server_role])
   mon_host << node[:ipaddress]
 else
-  search(:node, "role:#{node[:nagios][:server_role]} AND app_environment:#{node[:app_environment]}") do |n|
+  search(:node, "role:#{node[:nagios][:server_role]} AND chef_environment:#{node.chef_environment}") do |n|
     mon_host << n['ipaddress']
   end
 end
diff --git a/nagios/recipes/server.rb b/nagios/recipes/server.rb
index d2cea3b9a..14e1c51fa 100644
--- a/nagios/recipes/server.rb
+++ b/nagios/recipes/server.rb
@@ -26,7 +26,7 @@
 include_recipe "nagios::client"
 
 sysadmins = search(:users, 'groups:sysadmin')
-nodes = search(:node, "hostname:[* TO *] AND app_environment:#{node[:app_environment]}")
+nodes = search(:node, "hostname:* AND chef_environment:#{node.chef_environment}")
 
 if nodes.empty?
   Chef::Log.info("No nodes returned from search, using this node so hosts.cfg has data")
@@ -43,7 +43,7 @@
 service_hosts= Hash.new
 search(:role, "*:*") do |r|
   role_list << r.name
-  search(:node, "role:#{r.name} AND app_environment:#{node[:app_environment]}") do |n|
+  search(:node, "role:#{r.name} AND chef_environment:#{node.chef_environment}") do |n|
     service_hosts[r.name] = n['hostname']
   end
 end
diff --git a/nagios/templates/default/apache2.conf.erb b/nagios/templates/default/apache2.conf.erb
index 319fd6894..c40ac217a 100644
--- a/nagios/templates/default/apache2.conf.erb
+++ b/nagios/templates/default/apache2.conf.erb
@@ -1,7 +1,7 @@
 <VirtualHost *:80>
   ServerAdmin     <%= node[:nagios][:sysadmin_email] %>
   ServerName      <%= node[:fqdn] %>
-	ServerAlias     nagios nagios.<%= node[:app_environment]%>.<%= @public_domain %>
+	ServerAlias     nagios nagios.<%= node.chef_environment%>.<%= @public_domain %>
   DocumentRoot    <%= node[:nagios][:docroot] %>
   CustomLog       /var/log/nagios3/apache_access.log combined
   ErrorLog        /var/log/nagios3/apache_error.log
diff --git a/radiant/recipes/db_bootstrap.rb b/radiant/recipes/db_bootstrap.rb
index c12547d16..ba1cdb394 100644
--- a/radiant/recipes/db_bootstrap.rb
+++ b/radiant/recipes/db_bootstrap.rb
@@ -34,7 +34,7 @@
 app = data_bag_item("apps", "radiant")
 
 node.set[:radiant][:db_bootstrap] = <<EOS
-yes | rake #{node[:app_environment]} db:bootstrap \
+yes | rake #{node.chef_environment} db:bootstrap \
 ADMIN_NAME=Administrator \
 ADMIN_USERNAME=admin \
 ADMIN_PASSWORD=radiant \
diff --git a/radiant/recipes/default.rb b/radiant/recipes/default.rb
index ef11adfd9..5f7db16b9 100644
--- a/radiant/recipes/default.rb
+++ b/radiant/recipes/default.rb
@@ -22,68 +22,26 @@
 
 appname = "radiant"
 
-include_recipe "git"
 include_recipe "sqlite"
-include_recipe "rails"
 include_recipe "apache2"
 include_recipe "apache2::mod_rewrite"
 include_recipe "passenger_apache2::mod_rails"
 
 gem_package "sqlite3-ruby"
 
-if radiant_edge?
-
-  %w{config log pids sqlite system}.each do |dir|
-    directory "/srv/#{appname}/shared/#{dir}" do
-      recursive true
-      owner "railsdev"
-      group "railsdev"
-      mode "0775"
-    end
-  end
-
-  template "/srv/#{appname}/shared/config/database.yml" do
-    source "database.yml.erb"
-    owner "railsdev"
-    group "railsdev"
-    variables :appname => appname
-    mode "0664"
-  end
-
-  file "/srv/#{appname}/shared/sqlite/production.sqlite3" do
-    owner "railsdev"
-    group "railsdev"
-    mode "0664"
-  end
-
-  deploy "/srv/#{appname}" do
-    repo "git://github.com/radiant/radiant.git"
-    branch node[:radiant][:branch]
-    user "railsdev"
-    enable_submodules false
-    migrate node[:radiant][:migrate]
-    migration_command node[:radiant][:migrate_command]
-    environment node[:radiant][:environment]
-    shallow_clone true
-    revision node[:radiant][:revision]
-    action node[:radiant][:action].to_sym
-    restart_command "touch tmp/restart.txt"
-  end
-else
-  directory "/srv/#{appname}/current/" do
-    recursive true
-    owner "railsdev"
-    group "railsdev"
-    mode "0775"
-  end
+directory "/srv/#{appname}/current/" do
+  recursive true
+  owner "railsdev"
+  group "railsdev"
+  mode "0775"
+end
 
-  gem_package "radiant"
+gem_package "radiant"
 
-  execute "radiant_generate" do
-    command "radiant -d sqlite3 /srv/#{appname}/current/"
-    creates "/srv/#{appname}/current/public"
-    user "railsdev"
-  end
+execute "radiant_generate" do
+  command "radiant -d sqlite3 /srv/#{appname}/current/"
+  creates "/srv/#{appname}/current/public"
+  user "railsdev"
 end
 
 web_app "#{appname}" do