diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-11 19:34:51 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-11 19:34:51 +0100 |
| commit | 82e93efa43f54760beed29803931d7a4ced4fc18 (patch) | |
| tree | 19958bb12af4fbf0f510b5ae1c9aa95a0036749f /config | |
| parent | d17059acb5fb56b68d1afe0e15e8d62e2842bbc8 (diff) | |
Erb bug fix.
Diffstat (limited to 'config')
| -rw-r--r-- | config/database.yml | 14 |
1 files changed, 7 insertions, 7 deletions
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". |