summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/database.yml21
1 files changed, 2 insertions, 19 deletions
diff --git a/config/database.yml b/config/database.yml
index f842c1e..ce0e60d 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -14,22 +14,5 @@ development:
adapter: mysql
database: mappe
username: mappe
- password: keuchfrosch
- host: localhost
-
-# Warning: The database defined as 'test' will be erased and
-# re-generated from your development database when you run 'rake'.
-# Do not set this db to the same as development or production.
-test:
- adapter: mysql
- database: mappe
- username: ffscript
- password: woasinid
- host: localhost
-
-production:
- adapter: mysql
- database: mappe
- username: ffscript
- password: woasinid
- host: localhost
+ password: <%= ENV['MANMAN_DB_PWD'] %>
+ socket: /var/run/mysql.sock