mirrors
/
donphan
mirror of https://github.com/Siphonay/mastodon
1
0
Fork 0
Code Releases Activity

Use rails configuration storage for paperclip path (#31651)

This commit is contained in:
Matt Jankowski 2024-08-30 05:46:09 -04:00 committed by GitHub
parent 3ddeaca863
commit 85e8d1f285
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/initializers/paperclip.rb
View File

@ -160,9 +160,10 @@ elsif ENV['AZURE_ENABLED'] == 'true'
) )
end end
else else
Rails.configuration.x.file_storage_root_path = ENV.fetch('PAPERCLIP_ROOT_PATH', File.join(':rails_root', 'public', 'system'))
Paperclip::Attachment.default_options.merge!( Paperclip::Attachment.default_options.merge!(
storage: :filesystem, storage: :filesystem,
path: File.join(ENV.fetch('PAPERCLIP_ROOT_PATH', File.join(':rails_root', 'public', 'system')), ':prefix_path:class', ':attachment', ':id_partition', ':style', ':filename'), path: File.join(Rails.configuration.x.file_storage_root_path, ':prefix_path:class', ':attachment', ':id_partition', ':style', ':filename'),
url: ENV.fetch('PAPERCLIP_ROOT_URL', '/system') + "/#{PATH}" url: ENV.fetch('PAPERCLIP_ROOT_URL', '/system') + "/#{PATH}"
) )
end end

2
lib/mastodon/cli/media.rb
View File

@ -157,7 +157,7 @@ module Mastodon::CLI
when :filesystem when :filesystem
require 'find' require 'find'
root_path = ENV.fetch('PAPERCLIP_ROOT_PATH', File.join(':rails_root', 'public', 'system')).gsub(':rails_root', Rails.root.to_s) root_path = Rails.configuration.x.file_storage_root_path.gsub(':rails_root', Rails.root.to_s)
Find.find(File.join(*[root_path, prefix].compact)) do |path| Find.find(File.join(*[root_path, prefix].compact)) do |path|
next if File.directory?(path) next if File.directory?(path)