From 2d66b8f5a24e40345a324bbc2713329446e94681 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Thu, 3 Jan 2013 09:55:04 +0100 Subject: [PATCH] Updated default db settings. --- config/database.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/config/database.yml b/config/database.yml index 51a4dd459..f6f905dbd 100644 --- a/config/database.yml +++ b/config/database.yml @@ -6,8 +6,9 @@ development: adapter: sqlite3 database: db/development.sqlite3 - pool: 5 timeout: 5000 + pool: 50 + # Warning: The database defined as "test" will be erased and # re-generated from your development database when you run "rake". @@ -15,11 +16,15 @@ development: test: adapter: sqlite3 database: db/test.sqlite3 - pool: 5 timeout: 5000 + pool: 50 production: - adapter: sqlite3 - database: db/production.sqlite3 - pool: 5 + adapter: mysql2 + database: zammad_prod + pool: 50 timeout: 5000 + encoding: utf8 + username: some_user + password: some_pass + host: 127.0.0.1