Skip to content

Commit

Permalink
Merge 029bdb1 into 324e5b6
Browse files Browse the repository at this point in the history
  • Loading branch information
Avantol13 committed Mar 2, 2020
2 parents 324e5b6 + 029bdb1 commit faea34f
Showing 1 changed file with 23 additions and 21 deletions.
44 changes: 23 additions & 21 deletions fence/config-default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -476,30 +476,32 @@ STORAGE_CREDENTIALS: []
# AWS BUCKETS AND CREDENTIALS
# - Support `/data` endpoints
# //////////////////////////////////////////////////////////////////////////////////////
AWS_CREDENTIALS:
'CRED1':
aws_access_key_id: ''
aws_secret_access_key: ''
'CRED2':
aws_access_key_id: ''
aws_secret_access_key: ''
AWS_CREDENTIALS: []
# NOTE: Remove the [] and supply creds if needed. Example in comments below
# 'CRED1':
# aws_access_key_id: ''
# aws_secret_access_key: ''
# 'CRED2':
# aws_access_key_id: ''
# aws_secret_access_key: ''

# NOTE: the region is optonal for s3_buckets, however it should be specified to avoid a
# call to GetBucketLocation which you make lack the AWS ACLs for.
S3_BUCKETS:
bucket1:
cred: 'CRED1'
region: 'us-east-1'
bucket2:
cred: 'CRED2'
region: 'us-east-1'
bucket3:
cred: '*'
region: 'us-east-1'
bucket4:
cred: 'CRED1'
region: 'us-east-1'
role-arn: 'arn:aws:iam::role1'
S3_BUCKETS: []
# NOTE: Remove the [] and supply buckets if needed. Example in comments below
# bucket1:
# cred: 'CRED1'
# region: 'us-east-1'
# bucket2:
# cred: 'CRED2'
# region: 'us-east-1'
# bucket3:
# cred: '*'
# region: 'us-east-1'
# bucket4:
# cred: 'CRED1'
# region: 'us-east-1'
# role-arn: 'arn:aws:iam::role1'

# `DATA_UPLOAD_BUCKET` specifies an S3 bucket to which data files are uploaded,
# using the `/data/upload` endpoint. This must be one of the first keys under
Expand Down

0 comments on commit faea34f

Please sign in to comment.