summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorJulian Pawlowski <julian.pawlowski@gmail.com>2013-01-11 20:31:47 +0100
committerJulian Pawlowski <julian.pawlowski@gmail.com>2013-01-11 20:31:47 +0100
commit640db8fccdad8e60224af30359cef0dd2c9086e6 (patch)
tree8745b318f67601c99b178d46ff1ebe9190ef7452 /config
parente294c7d3febf5aaae8f7141f07111293bcb9d54d (diff)
fix database.yml for development environment
closes issue #90
Diffstat (limited to 'config')
-rw-r--r--config/database.yml31
1 files changed, 21 insertions, 10 deletions
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 %>