diff --git a/files/gitlab-cookbooks/gitlab/attributes/default.rb b/files/gitlab-cookbooks/gitlab/attributes/default.rb
index 99c65df..0ab65c8 100644
--- a/files/gitlab-cookbooks/gitlab/attributes/default.rb
+++ b/files/gitlab-cookbooks/gitlab/attributes/default.rb
@@ -100,6 +100,14 @@ default['gitlab']['gitlab-rails']['git_bin_path'] = "/opt/gitlab/embedded/bin/gi
 default['gitlab']['gitlab-rails']['git_max_size'] = 5242880
 default['gitlab']['gitlab-rails']['git_timeout'] = 10
 
+default['gitlab']['gitlab-rails']['db_adapter'] = "postgresql"
+default['gitlab']['gitlab-rails']['db_encoding'] = "unicode"
+default['gitlab']['gitlab-rails']['db_database'] = "gitlabhq_production"
+default['gitlab']['gitlab-rails']['db_pool'] = 10
+default['gitlab']['gitlab-rails']['db_username'] = "gitlab"
+default['gitlab']['gitlab-rails']['db_password'] = "password"
+default['gitlab']['gitlab-rails']['db_host'] = "localhost"
+default['gitlab']['gitlab-rails']['db_port'] = 6379
 
 ####
 # Unicorn
diff --git a/files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb b/files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb
index fb2b61f..ba41345 100644
--- a/files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb
+++ b/files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb
@@ -53,13 +53,24 @@ template_symlink File.join(gitlab_rails_etc_dir, "secret") do
   restarts dependent_services
 end
 
+database_attributes = node['gitlab']['gitlab-rails'].to_hash
+if node['gitlab']['postgresql']['enable']
+  database_attributes.merge!(
+    :db_adapter => "postgresql",
+    :db_username => node['gitlab']['postgresql']['sql_user'],
+    :db_password => node['gitlab']['postgresql']['sql_password'],
+    :db_host => node['gitlab']['postgresql']['listen_address'],
+    :db_port => node['gitlab']['postgresql']['port']
+  )
+end
+
 template_symlink File.join(gitlab_rails_etc_dir, "database.yml") do
   link_from File.join(gitlab_rails_source_dir, "config/database.yml")
-  source "database.yml.postgresql.erb"
+  source "database.yml.erb"
   owner "root"
   group "root"
   mode "0644"
-  variables(node['gitlab']['postgresql'].to_hash)
+  variables database_attributes
   restarts dependent_services
 end
 
diff --git a/files/gitlab-cookbooks/gitlab/templates/default/database.yml.erb b/files/gitlab-cookbooks/gitlab/templates/default/database.yml.erb
new file mode 100644
index 0000000..3a2aca9
--- /dev/null
+++ b/files/gitlab-cookbooks/gitlab/templates/default/database.yml.erb
@@ -0,0 +1,9 @@
+production:
+  adapter: <%= @db_adapter %>
+  encoding: <%= @db_encoding %>
+  database: <%= @db_database %>
+  pool: <%= @db_pool %>
+  username: "<%= @db_username %>"
+  password: "<%= @db_password %>"
+  host: <%= @db_host %>
+  port: <%= @db_port %>
diff --git a/files/gitlab-cookbooks/gitlab/templates/default/database.yml.postgresql.erb b/files/gitlab-cookbooks/gitlab/templates/default/database.yml.postgresql.erb
deleted file mode 100644
index 71f8c72..0000000
--- a/files/gitlab-cookbooks/gitlab/templates/default/database.yml.postgresql.erb
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# PRODUCTION
-#
-production:
-  adapter: postgresql
-  encoding: unicode
-  database: gitlabhq_production
-  pool: 10
-  username: <%= node['gitlab']['postgresql']['sql_user'] %>
-  password: "<%= node['gitlab']['postgresql']['sql_password'] %>"
-  host: <%= node['gitlab']['postgresql']['listen_address'] %>
-  port: <%= node['gitlab']['postgresql']['port'] %>
-# socket: /tmp/postgresql.sock
-
-#
-# Development specific
-#
-development:
-  adapter: postgresql
-  encoding: unicode
-  database: gitlabhq_development
-  pool: 5
-  username: postgres
-  password:
-  # socket: /tmp/postgresql.sock
-
-#
-# Staging specific
-#
-staging:
-  adapter: postgresql
-  encoding: unicode
-  database: gitlabhq_staging
-  pool: 5
-  username: postgres
-  password:
-  # socket: /tmp/postgresql.sock
-
-# 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: &test
-  adapter: postgresql
-  encoding: unicode
-  database: gitlabhq_test
-  pool: 5
-  username: postgres
-  password:
-  # socket: /tmp/postgresql.sock
--
libgit2 0.21.2