diff options
| author | Starfall <root@starfall.blue> | 2019-12-29 17:53:54 -0600 |
|---|---|---|
| committer | Starfall <root@starfall.blue> | 2019-12-29 17:53:54 -0600 |
| commit | c0c9529df269816f52915a9802e5e30fbce9576b (patch) | |
| tree | 077a7a12c69b18dafd3db3226f4beac477d0f49f /config/initializers | |
| parent | 9ee65e89d547ae4a5bc0a5bdb59316ba5c061cfd (diff) | |
| parent | 22daf24600d8e99e4569740ee5836d25c70c1e8b (diff) | |
Merge branch 'glitch'
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/paperclip.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb index 96607b7ce..5109baff7 100644 --- a/config/initializers/paperclip.rb +++ b/config/initializers/paperclip.rb @@ -52,7 +52,7 @@ if ENV['S3_ENABLED'] == 'true' if ENV.has_key?('S3_ENDPOINT') Paperclip::Attachment.default_options[:s3_options].merge!( endpoint: ENV['S3_ENDPOINT'], - force_path_style: true + force_path_style: ENV['S3_OVERRIDE_PATH_STYLE'] != 'true', ) Paperclip::Attachment.default_options[:url] = ':s3_path_url' @@ -89,7 +89,7 @@ else Paperclip::Attachment.default_options.merge!( storage: :filesystem, use_timestamp: true, - path: ENV.fetch('PAPERCLIP_ROOT_PATH', ':rails_root/public/system') + '/:class/:attachment/:id_partition/:style/:filename', + path: File.join(ENV.fetch('PAPERCLIP_ROOT_PATH', File.join(':rails_root', 'public', 'system')), ':class', ':attachment', ':id_partition', ':style', ':filename'), url: ENV.fetch('PAPERCLIP_ROOT_URL', '/system') + '/:class/:attachment/:id_partition/:style/:filename', ) end |