From e8e55fe6d15d7f774f1f1a584ecefcf115f8ca7a Mon Sep 17 00:00:00 2001
From: Dylan Peerenboom <peerend@gmail.com>
Date: Mon, 1 Sep 2014 14:35:09 -0700
Subject: [PATCH] added database.yml to .gitignore, created
 database.yml.example, set db path to withink BikeBike

---
 .gitignore                  |  1 +
 config/application.rb       |  2 +-
 config/database.yml         | 13 +++++++------
 config/database.yml.example | 33 +++++++++++++++++++++++++++++++++
 4 files changed, 42 insertions(+), 7 deletions(-)
 create mode 100644 config/database.yml.example

diff --git a/.gitignore b/.gitignore
index f176882..84e5d84 100644
--- a/.gitignore
+++ b/.gitignore
@@ -68,3 +68,4 @@ brakeman.html
 # Ignore sensitive data
 /config/settings/local.rb
 /nbproject/private/
+database.yml
\ No newline at end of file
diff --git a/config/application.rb b/config/application.rb
index b8c5ba2..f185e8b 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -26,7 +26,7 @@ module BikeBike
 		# config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
 		config.i18n.default_locale = :en #:de
 		config.i18n.enforce_available_locales = false
-		self.paths['config/database'] = Rails.root.parent.join("secure/database.yml").to_s
+		self.paths['config/database'] = Rails.root.parent.join('BikeBike', 'config', 'database.yml')
 		# config.action_controller.default_url_options = { :trailing_slash => true }
 		#config.middleware.swap 'Rack::MethodOverride', 'Rack::MethodOverrideWithParams'
 		#config.i18n.exception_handler = I18n::MissingTranslationExceptionHandler.new
diff --git a/config/database.yml b/config/database.yml
index 7fee74a..9d6ec7b 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -18,8 +18,8 @@ development:
   adapter: postgresql
   encoding: unicode
   database: bike_bike_dev
-  username: bike_bike
-  password: NewOrleans@)!#
+  username: dylan
+  password: godwin
   host: 127.0.0.1
   port: 5432
   pool: 5
@@ -38,8 +38,8 @@ test: &test
   adapter: postgresql
   encoding: unicode
   database: bike_bike_test
-  username: bike_bike
-  password: NewOrleans@)!#
+  username: dylan
+  password: godwin
   host: 127.0.0.1
   port: 5432
   pool: 5
@@ -48,11 +48,12 @@ production:
   adapter: postgresql
   encoding: unicode
   database: bike_bike
-  username: bike_bike
-  password: NewOrleans@)!#
+  username: dylan
+  password: godwin
   host: 127.0.0.1
   port: 5432
   pool: 5
 
 cucumber:
   <<: *test
+
diff --git a/config/database.yml.example b/config/database.yml.example
new file mode 100644
index 0000000..444a258
--- /dev/null
+++ b/config/database.yml.example
@@ -0,0 +1,33 @@
+development:
+  adapter: postgresql
+  encoding: unicode
+  database: bike_bike_dev
+  username: bike_bike
+  password: admin
+  host: 127.0.0.1
+  port: 5432
+  pool: 5
+
+
+test: &test
+  adapter: postgresql
+  encoding: unicode
+  database: bike_bike_test
+  username: bike_bike
+  password: admmin
+  host: 127.0.0.1
+  port: 5432
+  pool: 5
+
+production:
+  adapter: postgresql
+  encoding: unicode
+  database: bike_bike
+  username: bike_bike
+  password: admin
+  host: 127.0.0.1
+  port: 5432
+  pool: 5
+
+cucumber:
+  <<: *test