diff options
| author | ThibG <thib@sitedethib.com> | 2018-08-21 19:54:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-21 19:54:21 +0200 |
| commit | 37965ac8d9773ae79f6b8dd6fcd353894d2194ca (patch) | |
| tree | 51f194442d2ec7ab760b443b98c7685f64481ca7 /config/initializers | |
| parent | c78918162642649ce294d89effbf2e815c2aa327 (diff) | |
| parent | 8b4abaa90d8dff64525d92c3ba1c750356608240 (diff) | |
Merge pull request #660 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/initializers')
| -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 |