2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-07 12:02:53 +08:00

Revert "Revert changes in 7b601ff2f8."

This reverts commit 93a448bcf7.
This commit is contained in:
Guo Xiang Tan 2019-03-11 14:13:48 +08:00
parent 93a448bcf7
commit 0663ee5df2

View file

@ -1030,23 +1030,28 @@ files:
s3_access_key_id:
default: ""
secret: true
shadowed_by_global: true
s3_secret_access_key:
default: ""
secret: true
shadowed_by_global: true
s3_region:
default: "us-east-1"
enum: "S3RegionSiteSetting"
shadowed_by_global: true
s3_upload_bucket:
default: ""
regex: '^[a-z0-9\-\/]+$' # can't use '.' when using HTTPS
s3_endpoint:
default: ""
regex: '^https?:\/\/.+[^\/]$'
shadowed_by_global: true
s3_cdn_url:
default: ""
regex: '^https?:\/\/.+[^\/]$'
s3_force_path_style:
default: false
shadowed_by_global: true
s3_configure_tombstone_policy:
default: true
shadowed_by_global: true