Skip to content
Permalink
Browse files

FEATURE: Add hidden setting to disable configuration of inventory bucket

  • Loading branch information
gschlager committed Jan 14, 2020
1 parent 12d2fe7 commit c351ffe580c86396b46f69c28b0244141068c586
Showing with 6 additions and 1 deletion.
  1. +3 −1 app/jobs/regular/update_s3_inventory.rb
  2. +3 −0 config/site_settings.yml
@@ -7,7 +7,9 @@ module Jobs
class UpdateS3Inventory < ::Jobs::Base

def execute(args)
return unless SiteSetting.enable_s3_inventory? && SiteSetting.Upload.enable_s3_uploads
return unless SiteSetting.enable_s3_inventory? &&
SiteSetting.Upload.enable_s3_uploads &&
SiteSetting.s3_configure_inventory_policy

[:upload, :optimized].each do |type|
s3_inventory = S3Inventory.new(Discourse.store.s3_helper, type)
@@ -1174,6 +1174,9 @@ files:
default: true
enable_s3_inventory:
default: false
s3_configure_inventory_policy:
default: true
hidden: true
allow_profile_backgrounds:
client: true
default: true

2 comments on commit c351ffe

@discoursereviewbot

This comment has been minimized.

Copy link

discoursereviewbot replied Jan 14, 2020

Régis Hanol posted:

There should be a test for that ;)

Please sign in to comment.
You can’t perform that action at this time.