Escape database passwords in config/database.yml (#17627)
* Add double quotes for using passwords that start with a comma * Escape database password in ymlmain
parent
2cd31b3177
commit
21e80a9792
|
@ -9,7 +9,7 @@ development:
|
||||||
<<: *default
|
<<: *default
|
||||||
database: <%= ENV['DB_NAME'] || 'mastodon_development' %>
|
database: <%= ENV['DB_NAME'] || 'mastodon_development' %>
|
||||||
username: <%= ENV['DB_USER'] %>
|
username: <%= ENV['DB_USER'] %>
|
||||||
password: <%= ENV['DB_PASS'] %>
|
password: <%= (ENV['DB_PASS'] || '').to_json %>
|
||||||
host: <%= ENV['DB_HOST'] %>
|
host: <%= ENV['DB_HOST'] %>
|
||||||
port: <%= ENV['DB_PORT'] %>
|
port: <%= ENV['DB_PORT'] %>
|
||||||
|
|
||||||
|
@ -20,7 +20,7 @@ test:
|
||||||
<<: *default
|
<<: *default
|
||||||
database: <%= ENV['DB_NAME'] || 'mastodon' %>_test<%= ENV['TEST_ENV_NUMBER'] %>
|
database: <%= ENV['DB_NAME'] || 'mastodon' %>_test<%= ENV['TEST_ENV_NUMBER'] %>
|
||||||
username: <%= ENV['DB_USER'] %>
|
username: <%= ENV['DB_USER'] %>
|
||||||
password: <%= ENV['DB_PASS'] %>
|
password: <%= (ENV['DB_PASS'] || '').to_json %>
|
||||||
host: <%= ENV['DB_HOST'] %>
|
host: <%= ENV['DB_HOST'] %>
|
||||||
port: <%= ENV['DB_PORT'] %>
|
port: <%= ENV['DB_PORT'] %>
|
||||||
|
|
||||||
|
@ -28,7 +28,7 @@ production:
|
||||||
<<: *default
|
<<: *default
|
||||||
database: <%= ENV['DB_NAME'] || 'mastodon_production' %>
|
database: <%= ENV['DB_NAME'] || 'mastodon_production' %>
|
||||||
username: <%= ENV['DB_USER'] || 'mastodon' %>
|
username: <%= ENV['DB_USER'] || 'mastodon' %>
|
||||||
password: <%= ENV['DB_PASS'] || '' %>
|
password: <%= (ENV['DB_PASS'] || '').to_json %>
|
||||||
host: <%= ENV['DB_HOST'] || 'localhost' %>
|
host: <%= ENV['DB_HOST'] || 'localhost' %>
|
||||||
port: <%= ENV['DB_PORT'] || 5432 %>
|
port: <%= ENV['DB_PORT'] || 5432 %>
|
||||||
prepared_statements: <%= ENV['PREPARED_STATEMENTS'] || 'true' %>
|
prepared_statements: <%= ENV['PREPARED_STATEMENTS'] || 'true' %>
|
||||||
|
|
Loading…
Reference in New Issue