diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2016-03-16 12:57:01 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-03-16 12:57:01 +0100 |
| commit | 48d66a205567f7a3d59ce21eb024e11b5eb18b75 (patch) | |
| tree | 42557386da40533f6478a21a2f057ccafac72e6e /config/database.yml | |
| parent | 2c374cd97cea67447cccee004ae7fe189db9abc5 (diff) | |
Fixing the docker container setup (with assets compilation &co)
Diffstat (limited to 'config/database.yml')
| -rw-r--r-- | config/database.yml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/config/database.yml b/config/database.yml index 8914ab16d..259244e6f 100644 --- a/config/database.yml +++ b/config/database.yml @@ -17,7 +17,8 @@ test: production: <<: *default - database: postgres - username: postgres - password: - host: db + database: <%= ENV['DB_NAME'] || 'mastodon_production' %> + username: <%= ENV['DB_USER'] || 'mastodon' %> + password: <%= ENV['DB_PASS'] || '' %> + host: <%= ENV['DB_HOST'] || 'localhost' %> + port: <%= ENV['DB_PORT'] || 5432 %> |