cincodenada
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Escape database passwords in config/database.yml (#17627) 

* Add double quotes for using passwords that start with a comma

* Escape database password in yml
This commit is contained in:
sasanquaneuf 2022-02-25 09:16:52 +09:00 committed by GitHub
parent 2cd31b3177
commit 21e80a9792
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/database.yml
View File

@ -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' %>