From 0e7f2bc3a968c4ad68deac08393d82a3ad78a3fa Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Tue, 7 Jan 2014 11:34:30 -0500
Subject: [PATCH] FIX: vagrant up may fail when copying redis.yml. we don't
 need to copy it anymore.

---
 .../cookbooks/discourse/files/default/redis.yml | 17 -----------------
 chef/cookbooks/discourse/recipes/default.rb     |  5 ++---
 2 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 100644 chef/cookbooks/discourse/files/default/redis.yml

diff --git a/chef/cookbooks/discourse/files/default/redis.yml b/chef/cookbooks/discourse/files/default/redis.yml
deleted file mode 100644
index 22565a19fc6..00000000000
--- a/chef/cookbooks/discourse/files/default/redis.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-defaults: &defaults
-  host: localhost
-  port: 6379
-  db: 0
-
-development:
-  <<: *defaults
-
-test:
-  <<: *defaults
-  db: 1
-
-staging:
-  <<: *defaults
-
-production:
-  <<: *defaults
diff --git a/chef/cookbooks/discourse/recipes/default.rb b/chef/cookbooks/discourse/recipes/default.rb
index 1f9378efca7..79672fc212c 100644
--- a/chef/cookbooks/discourse/recipes/default.rb
+++ b/chef/cookbooks/discourse/recipes/default.rb
@@ -1,4 +1,3 @@
 # Install the configuration files we need
-cookbook_file "/vagrant/config/redis.yml" do
-  source "redis.yml"
-end
\ No newline at end of file
+
+# Nothing here anymore. I'll leave this recipe in case we need to add stuff for vagrant again.
\ No newline at end of file