diff --git a/chef/cookbooks/discourse/files/default/database.yml b/chef/cookbooks/discourse/files/default/database.yml deleted file mode 100644 index 1fd6a466e59..00000000000 --- a/chef/cookbooks/discourse/files/default/database.yml +++ /dev/null @@ -1,30 +0,0 @@ -development: - adapter: postgresql - database: discourse_development - host: localhost - pool: 5 - timeout: 5000 - host_names: - - "localhost" - -# Warning: The database defined as "test" will be erased and -# re-generated from your development database when you run "rake". -# Do not set this db to the same as development or production. -test: - adapter: postgresql - database: discourse_test - host: localhost - pool: 5 - timeout: 5000 - host_names: - - test.localhost - -# using the test db, so jenkins can run this config -# we need it to be in production so it minifies assets -production: - adapter: postgresql - database: discourse_development - pool: 5 - timeout: 5000 - host_names: - - production.localhost diff --git a/chef/cookbooks/discourse/recipes/default.rb b/chef/cookbooks/discourse/recipes/default.rb index 2e58241ea84..1f9378efca7 100644 --- a/chef/cookbooks/discourse/recipes/default.rb +++ b/chef/cookbooks/discourse/recipes/default.rb @@ -1,8 +1,4 @@ # Install the configuration files we need -cookbook_file "/vagrant/config/database.yml" do - source "database.yml" -end - cookbook_file "/vagrant/config/redis.yml" do source "redis.yml" end \ No newline at end of file