mirror of https://github.com/mastodon/mastodon
Merge cbf78a4896
into 33f7e1cf99
This commit is contained in:
commit
14fa4084d9
|
@ -1,5 +1,9 @@
|
||||||
default: &default
|
default: &default
|
||||||
adapter: postgresql
|
adapter: postgresql
|
||||||
|
username: <%= ENV['DB_USER'] || 'mastodon' %>
|
||||||
|
password: <%= ENV['DB_PASS'] || '' %>
|
||||||
|
host: <%= ENV['DB_HOST'] || 'localhost' %>
|
||||||
|
port: <%= ENV['DB_PORT'] || 5432 %>
|
||||||
pool: 17
|
pool: 17
|
||||||
timeout: 5000
|
timeout: 5000
|
||||||
encoding: unicode
|
encoding: unicode
|
||||||
|
@ -18,7 +22,3 @@ test:
|
||||||
production:
|
production:
|
||||||
<<: *default
|
<<: *default
|
||||||
database: <%= ENV['DB_NAME'] || 'mastodon_production' %>
|
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 %>
|
|
||||||
|
|
Loading…
Reference in New Issue