diff --git a/.gitignore b/.gitignore
index 45309e301ff42459c936f2b294170e0573b20162..34fd0e2322e4b4dedbb82da5bbc998254cb8c832 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@
 *.enc
 
 /config/ldap.yml
+/config/database.yml
diff --git a/bin/setup b/bin/setup
index c9735e9710f183bd3e75cc58bfe937d46879a1eb..a1522c5667f67813e4cbddc4df948087dc40d291 100755
--- a/bin/setup
+++ b/bin/setup
@@ -19,10 +19,10 @@ FileUtils.chdir APP_ROOT do
   system! 'gem install bundler --conservative'
   system('bundle check') || system!('bundle install')
 
-  # puts "\n== Copying sample files =="
-  # unless File.exist?('config/database.yml')
-  #   FileUtils.cp 'config/database.yml.sample', 'config/database.yml'
-  # end
+  puts "\n== Copying sample files =="
+  unless File.exist?('config/database.yml')
+    FileUtils.cp 'config/database.yml.sample', 'config/database.yml'
+  end
 
   puts "\n== Preparing database =="
   system! 'bin/rails db:prepare'
diff --git a/config/database.yml b/config/database.yml.sample
similarity index 100%
rename from config/database.yml
rename to config/database.yml.sample