diff options
author | ThibG <thib@sitedethib.com> | 2020-02-29 03:00:43 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-29 03:00:43 +0100 |
commit | ce17cea2210f9ce9dcbaf68074c07633df61bb6f (patch) | |
tree | 707850e10f9da776a7061c4c73948da47327d3ea /lib/tasks | |
parent | 047fde18c3d20dcd74b14613a648a03b573f802d (diff) |
Fix installation failing when Redis password contains special characters (#13156)
* Add support for special characters in Redis passwords Fixes #13154 * Refactor
Diffstat (limited to 'lib/tasks')
-rw-r--r-- | lib/tasks/mastodon.rake | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake index 2e92e8ded..a873335d4 100644 --- a/lib/tasks/mastodon.rake +++ b/lib/tasks/mastodon.rake @@ -336,7 +336,20 @@ namespace :mastodon do if prompt.yes?('Save configuration?') cmd = TTY::Command.new(printer: :quiet) - File.write(Rails.root.join('.env.production'), "# Generated with mastodon:setup on #{Time.now.utc}\n\n" + env.each_pair.map { |key, value| "#{key}=#{value}" }.join("\n") + "\n") + env_contents = env.each_pair.map do |key, value| + if value.is_a?(String) && value =~ /[\s\#\\"]/ + if value =~ /[']/ + value = value.to_s.gsub(/[\\"\$]/) { |x| "\\#{x}" } + "#{key}=\"#{value}\"" + else + "#{key}='#{value}'" + end + else + "#{key}=#{value}" + end + end.join("\n") + + File.write(Rails.root.join('.env.production'), "# Generated with mastodon:setup on #{Time.now.utc}\n\n" + env_contents + "\n") if using_docker prompt.ok 'Below is your configuration, save it to an .env.production file outside Docker:' |