zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 9 Releases Wiki Activity

Improve database config file 

Enable us to have custom config for local development
This commit is contained in:
Yann Vaillant 2016-10-06 12:27:56 +02:00
parent 3298c7e1c8
commit cbf78a4896
No known key found for this signature in database
GPG Key ID: 7F68A69318B36335
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
config/database.yml
View File

@ -1,7 +1,11 @@
default: &default
adapter: postgresql
pool: 17
timeout: 5000
adapter: postgresql
username: <%= ENV['DB_USER'] || 'mastodon' %>
password: <%= ENV['DB_PASS'] || '' %>
host: <%= ENV['DB_HOST'] || 'localhost' %>
port: <%= ENV['DB_PORT'] || 5432 %>
pool: 17
timeout: 5000
encoding: unicode
development:
@ -18,7 +22,3 @@ test:
production:
<<: *default
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 %>