Skip to content

Commit

Permalink
renamed database.yml and moved it out of git to avoid conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
dkharrat committed Feb 5, 2011
1 parent 6f3db11 commit 0b79648
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 22 deletions.
1 change: 1 addition & 0 deletions .gitignore
@@ -1,4 +1,5 @@
.bundle
config/database.yml
db/*.sqlite3
log/*.log
tmp/
Expand Down
33 changes: 33 additions & 0 deletions config/database.example.yml
@@ -0,0 +1,33 @@
# SQLite version 3.x
# gem install sqlite3-ruby (not necessary on OS X Leopard)
development:
adapter: mysql2
encoding: utf8
database: seti_dev
pool: 5
username:
password:
socket: /var/run/mysqld/mysqld.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:
adapter: mysql2
encoding: utf8
database: seti_test
pool: 5
username:
password:
socket: /var/run/mysqld/mysqld.sock

production:
adapter: mysql2
encoding: utf8
database: seti_prod
pool: 5
username:
password:
socket: /var/run/mysqld/mysqld.sock

22 changes: 0 additions & 22 deletions config/database.yml

This file was deleted.

0 comments on commit 0b79648

Please sign in to comment.