Browse files

renamed database.yml and moved it out of git to avoid conflicts

  • Loading branch information...
1 parent 6f3db11 commit 0b796482f9dc0455a50d72922f6facce8b0b93c9 @dkharrat dkharrat committed Feb 5, 2011
Showing with 34 additions and 22 deletions.
  1. +1 −0 .gitignore
  2. +33 −0 config/database.example.yml
  3. +0 −22 config/database.yml
View
1 .gitignore
@@ -1,4 +1,5 @@
.bundle
+config/database.yml
db/*.sqlite3
log/*.log
tmp/
View
33 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
+
View
22 config/database.yml
@@ -1,22 +0,0 @@
-# SQLite version 3.x
-# gem install sqlite3-ruby (not necessary on OS X Leopard)
-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

0 comments on commit 0b79648

Please sign in to comment.