diff options
| author | pluralcafe-docker <docker@plural.cafe> | 2018-08-22 08:26:56 +0000 |
|---|---|---|
| committer | pluralcafe-docker <docker@plural.cafe> | 2018-08-22 08:26:56 +0000 |
| commit | a4935a8e24dcfa865fb330693d8ec90beca1aa98 (patch) | |
| tree | 9fc0be073bc2ed5bf4231d850106f214fdeb020e /config/initializers/paperclip.rb | |
| parent | c339d49d82b3fd2873831029d9c92b3fbf1236e3 (diff) | |
| parent | 37965ac8d9773ae79f6b8dd6fcd353894d2194ca (diff) | |
Merge branch 'glitch'
Diffstat (limited to 'config/initializers/paperclip.rb')
| -rw-r--r-- | config/initializers/paperclip.rb | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb index c134bc5b8..59ab9b9a1 100644 --- a/config/initializers/paperclip.rb +++ b/config/initializers/paperclip.rb @@ -74,14 +74,10 @@ elsif ENV['SWIFT_ENABLED'] == 'true' fog_public: true ) else - require 'fog/local' - Paperclip::Attachment.default_options.merge!( - fog_credentials: { - provider: 'Local', - local_root: ENV.fetch('PAPERCLIP_ROOT_PATH') { Rails.root.join('public', 'system') }, - }, - fog_directory: '', - fog_host: ENV.fetch('PAPERCLIP_ROOT_URL') { '/system' } + storage: :filesystem, + use_timestamp: true, + path: (ENV['PAPERCLIP_ROOT_PATH'] || ':rails_root/public/system') + '/:class/:attachment/:id_partition/:style/:filename', + url: (ENV['PAPERCLIP_ROOT_URL'] || '/system') + '/:class/:attachment/:id_partition/:style/:filename', ) end |