From 9e95d2b7283e3d49b88cea3a8be2b89ac9f165f9 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 30 Jun 2014 11:32:53 -0400 Subject: Only track an example database.yml --- .gitignore | 4 +++- config/database.example.yml | 25 +++++++++++++++++++++++++ config/database.yml | 25 ------------------------- 3 files changed, 28 insertions(+), 26 deletions(-) create mode 100644 config/database.example.yml delete mode 100644 config/database.yml diff --git a/.gitignore b/.gitignore index 9151edf..f73ed63 100644 --- a/.gitignore +++ b/.gitignore @@ -22,10 +22,12 @@ /config/application.yml # The rest is from Luke. +/config/database.yml /vendor/bundle /public/assets -nohup.out + # As noted above, you probably want to add the following to your global git config. +nohup.out .~lock.* *~ *# diff --git a/config/database.example.yml b/config/database.example.yml new file mode 100644 index 0000000..51a4dd4 --- /dev/null +++ b/config/database.example.yml @@ -0,0 +1,25 @@ +# SQLite version 3.x +# gem install sqlite3 +# +# Ensure the SQLite 3 gem is defined in your Gemfile +# gem 'sqlite3' +development: + adapter: sqlite3 + database: db/development.sqlite3 + pool: 5 + timeout: 5000 + +# 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: sqlite3 + database: db/test.sqlite3 + pool: 5 + timeout: 5000 + +production: + adapter: sqlite3 + database: db/production.sqlite3 + pool: 5 + timeout: 5000 diff --git a/config/database.yml b/config/database.yml deleted file mode 100644 index 51a4dd4..0000000 --- a/config/database.yml +++ /dev/null @@ -1,25 +0,0 @@ -# SQLite version 3.x -# gem install sqlite3 -# -# Ensure the SQLite 3 gem is defined in your Gemfile -# gem 'sqlite3' -development: - adapter: sqlite3 - database: db/development.sqlite3 - pool: 5 - timeout: 5000 - -# 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: sqlite3 - database: db/test.sqlite3 - pool: 5 - timeout: 5000 - -production: - adapter: sqlite3 - database: db/production.sqlite3 - pool: 5 - timeout: 5000 -- cgit v1.2.3