diff options
Diffstat (limited to 'bucky/util')
| -rw-r--r-- | bucky/util/federate.js | 4 | ||||
| -rw-r--r-- | bucky/util/middleware.js | 10 |
2 files changed, 12 insertions, 2 deletions
diff --git a/bucky/util/federate.js b/bucky/util/federate.js index 472c32e..b782801 100644 --- a/bucky/util/federate.js +++ b/bucky/util/federate.js @@ -62,7 +62,7 @@ module.exports = { var promises = files.map(file => { copyFileToS3(file, thread_id) file.set('thread', thread_id) - file.set('storage', 'i.asdf.us') + file.set('storage', process.env.S3_BUCKET) return send("file", file) }) return promises @@ -93,7 +93,7 @@ module.exports = { const dst_fn = thread_id + '/' + file.get('filename') fs.readFile('/Users/user/projects/bucky3/public/data/' + src_fn, (err, buffer) => { if (err) return console.log(err) - const remote_path = '/bucky/data/' + dst_fn + const remote_path = process.env.S3_PATH + '/data/' + dst_fn console.log(mime.lookup(file.get('filename'))) upload.client().putBuffer(buffer, remote_path, { 'Content-Length': buffer.length, diff --git a/bucky/util/middleware.js b/bucky/util/middleware.js index 47633da..9872665 100644 --- a/bucky/util/middleware.js +++ b/bucky/util/middleware.js @@ -14,9 +14,19 @@ var middleware = module.exports = { res.locals.env = process.env.NODE_ENV if (req.isAuthenticated()) { res.locals.show_header = true + res.locals.preload = JSON.stringify({ + env: res.locals.env, + s3: { + bucket: process.env.S3_BUCKET, + path: process.env.S3_PATH, + } + }) } else { res.locals.show_header = false + res.locals.preload = JSON.stringify({ + env: res.locals.env, + }) } next() }, |