From af49b3390ce352297c3b601c69b6b0557a9ae01d Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Fri, 11 Jan 2013 19:30:56 +0100 Subject: Load the production database configuration from the system odbc.ini file. --- config/database.yml | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) (limited to 'config/database.yml') diff --git a/config/database.yml b/config/database.yml index bd1748e..706ed06 100644 --- a/config/database.yml +++ b/config/database.yml @@ -1,13 +1,26 @@ 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/.odbc.ini' %> +<%- if File.exists?(system_odbc_ini_file) %> +<%- system_odbc_configuration = IniFile.load(system_odbc_ini_file) %> +<%- if !system_odbc_configuration['gemeinschaft']['DATABASE'].blank? && !system_odbc_configuration['gemeinschaft']['USER'].blank? %> +production: adapter: mysql2 encoding: utf8 - database: gemeinschaft - pool: 5 - username: gemeinschaft - password: gemeinschaft + database: <%= system_odbc_configuration['gemeinschaft']['DATABASE'] %> + pool: 10 + username: <%= system_odbc_configuration['gemeinschaft']['USER'] %> + password: <%= system_odbc_configuration['gemeinschaft']['PASSWORD'] %> socket: /var/run/mysqld/mysqld.sock - reconnect: true - + reconnect: true +<%- else %> production: adapter: mysql2 encoding: utf8 @@ -17,6 +30,8 @@ production: password: gemeinschaft socket: /var/run/mysqld/mysqld.sock reconnect: true +<%- end %> +<%- end %> # Warning: The database defined as "test" will be erased and # re-generated from your development database when you run "rake". -- cgit v1.2.3 From 82e93efa43f54760beed29803931d7a4ced4fc18 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Fri, 11 Jan 2013 19:34:51 +0100 Subject: Erb bug fix. --- config/database.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'config/database.yml') diff --git a/config/database.yml b/config/database.yml index 706ed06..8ec5d75 100644 --- a/config/database.yml +++ b/config/database.yml @@ -7,10 +7,10 @@ development: # Read the database configuration from the system odbc # configuration. # -<%- system_odbc_ini_file = '/var/lib/.odbc.ini' %> -<%- if File.exists?(system_odbc_ini_file) %> -<%- system_odbc_configuration = IniFile.load(system_odbc_ini_file) %> -<%- if !system_odbc_configuration['gemeinschaft']['DATABASE'].blank? && !system_odbc_configuration['gemeinschaft']['USER'].blank? %> +<% system_odbc_ini_file = '/var/lib/.odbc.ini' %> +<% if File.exists?(system_odbc_ini_file) %> +<% system_odbc_configuration = IniFile.load(system_odbc_ini_file) %> +<% if !system_odbc_configuration['gemeinschaft']['DATABASE'].blank? && !system_odbc_configuration['gemeinschaft']['USER'].blank? %> production: adapter: mysql2 encoding: utf8 @@ -20,7 +20,7 @@ production: password: <%= system_odbc_configuration['gemeinschaft']['PASSWORD'] %> socket: /var/run/mysqld/mysqld.sock reconnect: true -<%- else %> +<% else %> production: adapter: mysql2 encoding: utf8 @@ -30,8 +30,8 @@ production: password: gemeinschaft socket: /var/run/mysqld/mysqld.sock reconnect: true -<%- end %> -<%- end %> +<% end %> +<% end %> # Warning: The database defined as "test" will be erased and # re-generated from your development database when you run "rake". -- cgit v1.2.3 From e294c7d3febf5aaae8f7141f07111293bcb9d54d Mon Sep 17 00:00:00 2001 From: Julian Pawlowski Date: Fri, 11 Jan 2013 19:44:42 +0100 Subject: correct path to .odbc.ini --- config/database.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/database.yml') diff --git a/config/database.yml b/config/database.yml index 8ec5d75..8dbc998 100644 --- a/config/database.yml +++ b/config/database.yml @@ -7,7 +7,7 @@ development: # Read the database configuration from the system odbc # configuration. # -<% system_odbc_ini_file = '/var/lib/.odbc.ini' %> +<% 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) %> <% if !system_odbc_configuration['gemeinschaft']['DATABASE'].blank? && !system_odbc_configuration['gemeinschaft']['USER'].blank? %> -- cgit v1.2.3 From 640db8fccdad8e60224af30359cef0dd2c9086e6 Mon Sep 17 00:00:00 2001 From: Julian Pawlowski 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/database.yml') 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 From d8287a7dbcc287791ed069cfc14ca6b9db0e66a7 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sat, 12 Jan 2013 10:28:49 +0100 Subject: Fixed a logic if/else bug. --- config/database.yml | 42 +++++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 23 deletions(-) (limited to 'config/database.yml') diff --git a/config/database.yml b/config/database.yml index 2a7dcb5..364cbdb 100644 --- a/config/database.yml +++ b/config/database.yml @@ -1,17 +1,23 @@ <% 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) %> -<% if !system_odbc_configuration['gemeinschaft']['DATABASE'].blank? && !system_odbc_configuration['gemeinschaft']['USER'].blank? %> +<% if !File.exists?(system_odbc_ini_file) %> +development: + adapter: sqlite3 + database: db/development.sqlite3 + pool: 5 + timeout: 5000 + production: - adapter: mysql2 + adapter: mysql2 encoding: utf8 - database: <%= system_odbc_configuration['gemeinschaft']['DATABASE'] %> + database: gemeinschaft pool: 10 - username: <%= system_odbc_configuration['gemeinschaft']['USER'] %> - password: <%= system_odbc_configuration['gemeinschaft']['PASSWORD'] %> + username: gemeinschaft + password: gemeinschaft socket: /var/run/mysqld/mysqld.sock reconnect: true - +<% else %> +<% system_odbc_configuration = IniFile.load(system_odbc_ini_file) %> +<% if !system_odbc_configuration['gemeinschaft']['DATABASE'].blank? && !system_odbc_configuration['gemeinschaft']['USER'].blank? %> development: adapter: mysql2 encoding: utf8 @@ -21,24 +27,14 @@ development: password: <%= system_odbc_configuration['gemeinschaft']['PASSWORD'] %> socket: /var/run/mysqld/mysqld.sock reconnect: true -<% else %> -production: - adapter: mysql2 - encoding: utf8 - database: gemeinschaft - pool: 10 - username: gemeinschaft - password: gemeinschaft - socket: /var/run/mysqld/mysqld.sock - reconnect: true -development: +production: adapter: mysql2 encoding: utf8 - database: gemeinschaft - pool: 5 - username: gemeinschaft - password: gemeinschaft + database: <%= system_odbc_configuration['gemeinschaft']['DATABASE'] %> + pool: 10 + username: <%= system_odbc_configuration['gemeinschaft']['USER'] %> + password: <%= system_odbc_configuration['gemeinschaft']['PASSWORD'] %> socket: /var/run/mysqld/mysqld.sock reconnect: true <% end %> -- cgit v1.2.3