diff options
| author | Sheogorath | 2019-09-02 18:50:29 +0300 |
|---|---|---|
| committer | GitHub | 2019-09-02 18:50:29 +0300 |
| commit | 2e627099d895035d900bbb7aba656ce7d008c233 (patch) | |
| tree | fd2393adde86b17c9926c01e3debafeb0987c2b8 | |
| parent | 2b0300e2f2c41ee3bb0d7327e10fbe065b5e277a (diff) | |
| parent | 9613197f5d26efd699a00e322dc12a862ea3417b (diff) | |
Merge pull request #32 from codimd/aws-endpoints
make aws s3 endpoint configurable
| -rw-r--r-- | lib/config/environment.js | 3 | ||||
| -rw-r--r-- | lib/web/imageRouter/s3.js | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/config/environment.js b/lib/config/environment.js index d2350e72..716f8b75 100644 --- a/lib/config/environment.js +++ b/lib/config/environment.js @@ -41,7 +41,8 @@ module.exports = { s3: { accessKeyId: process.env.CMD_S3_ACCESS_KEY_ID, secretAccessKey: process.env.CMD_S3_SECRET_ACCESS_KEY, - region: process.env.CMD_S3_REGION + region: process.env.CMD_S3_REGION, + endpoint: process.env.CMD_S3_ENDPOINT }, minio: { accessKey: process.env.CMD_MINIO_ACCESS_KEY, diff --git a/lib/web/imageRouter/s3.js b/lib/web/imageRouter/s3.js index 4effea04..2bf08cc7 100644 --- a/lib/web/imageRouter/s3.js +++ b/lib/web/imageRouter/s3.js @@ -43,7 +43,9 @@ exports.uploadImage = function (imagePath, callback) { } let s3Endpoint = 's3.amazonaws.com' - if (config.s3.region && config.s3.region !== 'us-east-1') { + if (config.s3.endpoint) { + s3Endpoint = config.s3.endpoint + } else if (config.s3.region && config.s3.region !== 'us-east-1') { s3Endpoint = `s3-${config.s3.region}.amazonaws.com` } callback(null, `https://${s3Endpoint}/${config.s3bucket}/${params.Key}`) |