diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-11-14 10:31:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-14 10:31:28 +0100 |
| commit | 72335694744da87cbfaff20992cb36817f6f8a60 (patch) | |
| tree | 55c1b799be04cf83f425414dce762bf9403e2b85 /config/initializers | |
| parent | 81b1d32d5b618daa4003b8de8292ae4dd3e656f6 (diff) | |
| parent | c31e756644120cab650452e9d1c00a1e2f26ade4 (diff) | |
Merge pull request #1923 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/paperclip.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb index 26b0a2f7c..a2285427c 100644 --- a/config/initializers/paperclip.rb +++ b/config/initializers/paperclip.rb @@ -67,6 +67,12 @@ if ENV['S3_ENABLED'] == 'true' retry_limit: 0, } ) + + if ENV['S3_PERMISSION'] == '' + Paperclip::Attachment.default_options.merge!( + s3_permissions: ->(*) { nil } + ) + end if ENV.has_key?('S3_ENDPOINT') Paperclip::Attachment.default_options[:s3_options].merge!( @@ -119,6 +125,8 @@ elsif ENV['SWIFT_ENABLED'] == 'true' openstack_region: ENV['SWIFT_REGION'], openstack_cache_ttl: ENV.fetch('SWIFT_CACHE_TTL') { 60 }, }, + + fog_file: { 'Cache-Control' => 'public, max-age=315576000, immutable' }, fog_directory: ENV['SWIFT_CONTAINER'], fog_host: ENV['SWIFT_OBJECT_URL'], |