summaryrefslogtreecommitdiff
path: root/config/database.yml
diff options
context:
space:
mode:
authorPeter Kozak <spag@golwen.net>2012-12-20 10:03:24 +0100
committerPeter Kozak <spag@golwen.net>2012-12-20 10:03:24 +0100
commite405bce6ab07f385e32c0d885b1d51ca96bf1ff5 (patch)
tree510ced8b7d925f46292ee872d04aaa25a9d0a17f /config/database.yml
parent6bf23a88899522a52740113a3cfdccc7ae533fca (diff)
parent5c270c981a21d9aafaecb3b59b98dfa6a3d9d97f (diff)
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'config/database.yml')
-rw-r--r--config/database.yml37
1 files changed, 22 insertions, 15 deletions
diff --git a/config/database.yml b/config/database.yml
index 4ea8d4a..bd1748e 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -1,22 +1,29 @@
-development:
- adapter: sqlite3
- database: db/development.sqlite3
- pool: 5
- timeout: 5000
+development:
+ adapter: mysql2
+ encoding: utf8
+ database: gemeinschaft
+ pool: 5
+ username: gemeinschaft
+ password: gemeinschaft
+ socket: /var/run/mysqld/mysqld.sock
+ reconnect: true
-production:
- adapter: sqlite3
- database: db/development.sqlite3
- pool: 5
- timeout: 5000
+production:
+ adapter: mysql2
+ encoding: utf8
+ database: gemeinschaft
+ pool: 10
+ username: gemeinschaft
+ password: gemeinschaft
+ socket: /var/run/mysqld/mysqld.sock
+ reconnect: true
# 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<%= ENV['TEST_ENV_NUMBER'] %>.sqlite3
- pool: 5
- timeout: 5000
-
+ adapter: sqlite3
+ database: db/test.sqlite3
+ pool: 5
+ timeout: 5000 \ No newline at end of file