From 640db8fccdad8e60224af30359cef0dd2c9086e6 Mon Sep 17 00:00:00 2001
From: Julian Pawlowski <julian.pawlowski@gmail.com>
Date: Fri, 11 Jan 2013 20:31:47 +0100
Subject: fix database.yml for development environment closes issue #90

---
 config/database.yml | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

(limited to 'config')

diff --git a/config/database.yml b/config/database.yml
index 8dbc998..2a7dcb5 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -1,12 +1,3 @@
-development: 
-   adapter: sqlite3
-   database: db/development.sqlite3
-   pool: 5
-   timeout: 5000
-
-# Read the database configuration from the system odbc
-# configuration.
-#
 <% system_odbc_ini_file = '/var/lib/freeswitch/.odbc.ini' %>
 <% if File.exists?(system_odbc_ini_file) %>
 <% system_odbc_configuration = IniFile.load(system_odbc_ini_file) %>
@@ -20,9 +11,19 @@ production:
    password: <%= system_odbc_configuration['gemeinschaft']['PASSWORD'] %>
    socket: /var/run/mysqld/mysqld.sock 
    reconnect: true
+
+development:
+   adapter: mysql2 
+   encoding: utf8 
+   database: <%= system_odbc_configuration['gemeinschaft']['DATABASE'] %>
+   pool: 5
+   username: <%= system_odbc_configuration['gemeinschaft']['USER'] %>
+   password: <%= system_odbc_configuration['gemeinschaft']['PASSWORD'] %>
+   socket: /var/run/mysqld/mysqld.sock 
+   reconnect: true
 <% else %>
 production: 
-   adapter: mysql2 
+   adapter: mysql2
    encoding: utf8 
    database: gemeinschaft 
    pool: 10 
@@ -30,6 +31,16 @@ production:
    password: gemeinschaft 
    socket: /var/run/mysqld/mysqld.sock 
    reconnect: true
+
+development:
+   adapter: mysql2 
+   encoding: utf8 
+   database: gemeinschaft 
+   pool: 5
+   username: gemeinschaft 
+   password: gemeinschaft 
+   socket: /var/run/mysqld/mysqld.sock 
+   reconnect: true
 <% end %>
 <% end %>
 
-- 
cgit v1.2.3