diff options
| author | Julian Pawlowski <julian.pawlowski@gmail.com> | 2012-12-19 00:07:20 +0100 |
|---|---|---|
| committer | Julian Pawlowski <julian.pawlowski@gmail.com> | 2012-12-19 00:07:20 +0100 |
| commit | e5a6aa37a37199c3ebbcb1e0ddf2e4710639280b (patch) | |
| tree | 0e2af6dd5a5d3571ddb6b8cd07c2b0793c006466 /config/database.yml | |
| parent | c1dfb19a89a2f191bece906051477e12f3713512 (diff) | |
| parent | 4666adb72cd6a0316f0c1c338bc26449cebdd125 (diff) | |
Merge branch 'develop'
Diffstat (limited to 'config/database.yml')
| -rw-r--r-- | config/database.yml | 37 |
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 |