From 90121413900895958a2ed8daaae2ab1e7dde996d Mon Sep 17 00:00:00 2001
From: Lars Henrik Mai <lars.mai@kontinui.de>
Date: Sat, 29 Mar 2014 12:17:16 +0100
Subject: gitignore database config

---
 .gitignore                 | 33 +++++++++++++++----------
 config/database.yml        | 60 ----------------------------------------------
 config/database.yml.sample | 60 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 81 insertions(+), 72 deletions(-)
 delete mode 100644 config/database.yml
 create mode 100644 config/database.yml.sample

diff --git a/.gitignore b/.gitignore
index 6a502e9..d3aed67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1,25 @@
-# See https://help.github.com/articles/ignoring-files for more about ignoring files.
-#
-# If you find yourself ignoring temporary files generated by your text editor
-# or operating system, you probably want to add a global ignore instead:
-#   git config --global core.excludesfile '~/.gitignore_global'
+*.rbc
+capybara-*.html
+.rspec
+/log
+/tmp
+/db/*.sqlite3
+/public/system
+/coverage/
+/spec/tmp
+**.orig
+rerun.txt
+pickle-email-*.html
+config/initializers/secret_token.rb
+config/secrets.yml
+config/database.yml
 
-# Ignore bundler config.
+## Environment normalisation:
 /.bundle
+/vendor/bundle
 
-# Ignore the default SQLite database.
-/db/*.sqlite3
-/db/*.sqlite3-journal
+# these should all be checked in to normalise the environment:
+# Gemfile.lock, .ruby-version, .ruby-gemset
 
-# Ignore all logfiles and tempfiles.
-/log/*.log
-/tmp
+# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
+.rvmrc
diff --git a/config/database.yml b/config/database.yml
deleted file mode 100644
index d34cefa..0000000
--- a/config/database.yml
+++ /dev/null
@@ -1,60 +0,0 @@
-# PostgreSQL. Versions 8.2 and up are supported.
-#
-# Install the pg driver:
-#   gem install pg
-# On OS X with Homebrew:
-#   gem install pg -- --with-pg-config=/usr/local/bin/pg_config
-# On OS X with MacPorts:
-#   gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config
-# On Windows:
-#   gem install pg
-#       Choose the win32 build.
-#       Install PostgreSQL and put its /bin directory on your path.
-#
-# Configure Using Gemfile
-# gem 'pg'
-#
-development:
-  adapter: postgresql
-  encoding: unicode
-  database: hfw_development
-  pool: 5
-  username: hfw
-  password:
-
-  # Connect on a TCP socket. Omitted by default since the client uses a
-  # domain socket that doesn't need configuration. Windows does not have
-  # domain sockets, so uncomment these lines.
-  #host: localhost
-
-  # The TCP port the server listens on. Defaults to 5432.
-  # If your server runs on a different port number, change accordingly.
-  #port: 5432
-
-  # Schema search path. The server defaults to $user,public
-  #schema_search_path: myapp,sharedapp,public
-
-  # Minimum log levels, in increasing order:
-  #   debug5, debug4, debug3, debug2, debug1,
-  #   log, notice, warning, error, fatal, and panic
-  # Defaults to warning.
-  #min_messages: notice
-
-# 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
-  encoding: unicode
-  database: hfw_test
-  pool: 5
-  username: hfw
-  password:
-
-production:
-  adapter: postgresql
-  encoding: unicode
-  database: hfw_production
-  pool: 5
-  username: hfw
-  password:
diff --git a/config/database.yml.sample b/config/database.yml.sample
new file mode 100644
index 0000000..d34cefa
--- /dev/null
+++ b/config/database.yml.sample
@@ -0,0 +1,60 @@
+# PostgreSQL. Versions 8.2 and up are supported.
+#
+# Install the pg driver:
+#   gem install pg
+# On OS X with Homebrew:
+#   gem install pg -- --with-pg-config=/usr/local/bin/pg_config
+# On OS X with MacPorts:
+#   gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config
+# On Windows:
+#   gem install pg
+#       Choose the win32 build.
+#       Install PostgreSQL and put its /bin directory on your path.
+#
+# Configure Using Gemfile
+# gem 'pg'
+#
+development:
+  adapter: postgresql
+  encoding: unicode
+  database: hfw_development
+  pool: 5
+  username: hfw
+  password:
+
+  # Connect on a TCP socket. Omitted by default since the client uses a
+  # domain socket that doesn't need configuration. Windows does not have
+  # domain sockets, so uncomment these lines.
+  #host: localhost
+
+  # The TCP port the server listens on. Defaults to 5432.
+  # If your server runs on a different port number, change accordingly.
+  #port: 5432
+
+  # Schema search path. The server defaults to $user,public
+  #schema_search_path: myapp,sharedapp,public
+
+  # Minimum log levels, in increasing order:
+  #   debug5, debug4, debug3, debug2, debug1,
+  #   log, notice, warning, error, fatal, and panic
+  # Defaults to warning.
+  #min_messages: notice
+
+# 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
+  encoding: unicode
+  database: hfw_test
+  pool: 5
+  username: hfw
+  password:
+
+production:
+  adapter: postgresql
+  encoding: unicode
+  database: hfw_production
+  pool: 5
+  username: hfw
+  password:
-- 
cgit v1.2.1