Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-10 21:01:33 +08:00
Code Packages Activity Actions 16

Revert "Revert changes in 7b601ff2f8."

Browse source 
This reverts commit 93a448bcf7.
This commit is contained in:
Guo Xiang Tan 2019-03-11 14:13:48 +08:00
parent 93a448bcf7
commit 0663ee5df2
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
config/site_settings.yml
View file

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