From dafc941a04d183d98a8804deffee25d6a83900c7 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Tue, 14 May 2019 10:24:14 +1000
Subject: [PATCH] FEATURE: allow shadowing all s3 settings

Previously enable s3 uploads and s3 upload bucket were not shadowed.

This caused confusion when people were configuring stuff via env cause most
of s3 settings are shadowed.
---
 config/site_settings.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/site_settings.yml b/config/site_settings.yml
index d513c6b616b..a690f16c4cb 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -1074,6 +1074,7 @@ files:
   enable_s3_uploads:
     default: false
     client: true
+    shadowed_by_global: true
   s3_use_iam_profile: false
   s3_access_key_id:
     default: ""
@@ -1090,6 +1091,7 @@ files:
   s3_upload_bucket:
     default: ""
     regex: '^[a-z0-9\-\/_]+$' # can't use '.' when using HTTPS
+    shadowed_by_global: true
   s3_endpoint:
     default: ""
     regex: '^https?:\/\/.+[^\/]$'