summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorNicolas Braud-Santoni <nicoo@ffgraz.net>2016-08-21 00:15:27 +0200
committerNicolas Braud-Santoni <nicoo@ffgraz.net>2016-08-21 00:15:27 +0200
commit664d4179d8f661747f09a9e2982d46793181b56a (patch)
tree1e144c601ab89b7bb5ebcdfd19be321dab54f4a8 /config
parent877380b7820d2d0dd6182482dd4247e18b5dca59 (diff)
Fix database access
- Make DB access more configurable - Make sure that Rails uses libmysqlclient, rather than its “native” and non-forward-compatible DB driver.
Diffstat (limited to 'config')
-rw-r--r--config/database.yml13
1 files changed, 10 insertions, 3 deletions
diff --git a/config/database.yml b/config/database.yml
index 057b5fe..ed2cdde 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -12,7 +12,14 @@
# http://dev.mysql.com/doc/refman/5.0/en/old-client.html
development:
adapter: mysql
- database: mappe
- username: mappe
- password: <%= ENV['MANMAN_DB_PWD'] %>
+ database: <%= ENV['MANMAN_DB_NAME'] %>
+ username: <%= ENV['MANMAN_DB_USER'] %>
+ password: <%= ENV['MANMAN_DB_PWD'] %>
+ socket: /var/run/mysqld/mysqld.sock
+
+production:
+ adapter: mysql
+ database: <%= ENV['MANMAN_DB_NAME'] %>
+ username: <%= ENV['MANMAN_DB_USER'] %>
+ password: <%= ENV['MANMAN_DB_PWD'] %>
socket: /var/run/mysqld/mysqld.sock