github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-02-16 23:03:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

seperate the standard s3 creds from the bucket s3 creds

Browse source
This commit is contained in:
Henry Oswald 2018-07-10 14:17:37 +01:00
parent 0659878b50
commit 089bf3e084
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/filestore/app/coffee/BucketController.coffee
View file

@ -9,7 +9,7 @@ module.exports = BucketController =
getFile: (req, res)-> getFile: (req, res)->
{bucket} = req.params {bucket} = req.params
key = req.params[0] key = req.params[0]
credentials = settings.filestore.s3?[bucket] credentials = settings.filestore.s3BucketCreds?[bucket]
options = { options = {
key: key, key: key,
bucket: bucket, bucket: bucket,

5
services/filestore/config/settings.defaults.coffee
View file

@ -28,11 +28,14 @@ module.exports =
# s3: # s3:
# key: "" # default # key: "" # default
# secret: "" # default # secret: "" # default
#
# s3BucketCreds:
# bucketname1: # secrets for bucketname1 # bucketname1: # secrets for bucketname1
# auth_key: "" # auth_key: ""
# auth_secret: "" # auth_secret: ""
# bucketname2: # secrets for bucketname2... # bucketname2: # secrets for bucketname2...
s3: JSON.parse process.env['S3_CREDENTIALS'] if process.env['S3_CREDENTIALS']
s3BucketCreds: JSON.parse process.env['S3_BUCKET_CREDENTIALS'] if process.env['S3_BUCKET_CREDENTIALS']
path: path:
uploadFolder: Path.resolve(__dirname + "/../uploads") uploadFolder: Path.resolve(__dirname + "/../uploads")