Make sure we use the correct gem and bundler for blogs

[chef.git] / cookbooks / dev / recipes / default.rb

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index e33c3b230e4d68d728aca6de963f6a92d993fdbd..e4a977f8a225487b385da6843a8f383942fb0270 100644 (file)
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -260,8 +260,6 @@ if node[:postgresql][:clusters][:"12/main"]
       site_aliases = details[:aliases] || []
       secret_key_base = persistent_token("dev", "rails", name, "secret_key_base")
 
-      node.rm_normal(:dev, :rails, name)
-
       postgresql_database database_name do
         cluster "12/main"
         owner "apis"
@@ -313,6 +311,7 @@ if node[:postgresql][:clusters][:"12/main"]
         database_port node[:postgresql][:clusters][:"12/main"][:port]
         database_name database_name
         database_username "apis"
+        email_from "OpenStreetMap <web@noreply.openstreetmap.org>"
         gpx_dir gpx_directory
         log_path "#{log_directory}/rails.log"
         memcache_servers ["127.0.0.1"]