Discource-C/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-16 08:15:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert changes in 7b601ff2f8dca3615fb72591070f5578d886b5d7.

Browse Source 
The site setting names and global setting names are similar and that
prevents global settings from being configured via the ENV.
This commit is contained in:
Guo Xiang Tan 2019-03-11 13:52:12 +08:00
parent 62579d79d4
commit 93a448bcf7
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/site_settings.yml
View File

@ -1030,28 +1030,23 @@ 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