mirror of
https://github.com/discourse/discourse.git
synced 2025-01-19 12:02:59 +08:00
Merge pull request #6334 from pfaffman/patch-3
Add shadows to enable S3 backups to Digital Ocean
This commit is contained in:
commit
a6319ccf21
|
@ -933,10 +933,14 @@ files:
|
||||||
default: false
|
default: false
|
||||||
client: true
|
client: true
|
||||||
s3_use_iam_profile: false
|
s3_use_iam_profile: false
|
||||||
s3_access_key_id: ''
|
s3_access_key_id:
|
||||||
|
default: ''
|
||||||
|
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'
|
||||||
|
@ -946,6 +950,7 @@ files:
|
||||||
s3_endpoint:
|
s3_endpoint:
|
||||||
default: 'https://s3.amazonaws.com'
|
default: 'https://s3.amazonaws.com'
|
||||||
regex: '^https?:\/\/.+[^\/]$'
|
regex: '^https?:\/\/.+[^\/]$'
|
||||||
|
shadowed_by_global: true
|
||||||
s3_cdn_url:
|
s3_cdn_url:
|
||||||
default: ''
|
default: ''
|
||||||
regex: '^https?:\/\/.+[^\/]$'
|
regex: '^https?:\/\/.+[^\/]$'
|
||||||
|
|
Loading…
Reference in New Issue
Block a user