diff options
| author | mei23 <m@m544.net> | 2018-07-26 17:29:05 +0900 |
|---|---|---|
| committer | mei23 <m@m544.net> | 2018-07-26 17:29:05 +0900 |
| commit | 8ef38ebab1df99c87836748fc7341b52781c38cb (patch) | |
| tree | 20bdf665fe88ee012b516b5d22600b1c82477a5a /src | |
| parent | Set Cache-Control to object-storage (diff) | |
| download | sharkey-8ef38ebab1df99c87836748fc7341b52781c38cb.tar.gz sharkey-8ef38ebab1df99c87836748fc7341b52781c38cb.tar.bz2 sharkey-8ef38ebab1df99c87836748fc7341b52781c38cb.zip | |
Add config.drive.baseUrl
Diffstat (limited to 'src')
| -rw-r--r-- | src/config/types.ts | 1 | ||||
| -rw-r--r-- | src/services/drive/add-file.ts | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/config/types.ts b/src/config/types.ts index b554650820..a3d55e2843 100644 --- a/src/config/types.ts +++ b/src/config/types.ts @@ -53,6 +53,7 @@ export type Source = { storage: string; bucket?: string; prefix?: string; + baseUrl?: string; config?: any; }; diff --git a/src/services/drive/add-file.ts b/src/services/drive/add-file.ts index dbb1224cd8..48f2388193 100644 --- a/src/services/drive/add-file.ts +++ b/src/services/drive/add-file.ts @@ -25,6 +25,8 @@ async function save(readable: stream.Readable, name: string, type: string, hash: const minio = new Minio.Client(config.drive.config); const id = uuid.v4(); const obj = `${config.drive.prefix}/${id}`; + const baseUrl = config.drive.baseUrl + || `${ config.drive.config.secure ? 'https' : 'http' }://${ config.drive.config.endPoint }${ config.drive.config.port ? ':' + config.drive.config.port : '' }/${ config.drive.bucket }`; await minio.putObject(config.drive.bucket, obj, readable, size, { 'Content-Type': type, 'Cache-Control': 'max-age=31536000, immutable' }); Object.assign(metadata, { @@ -33,7 +35,7 @@ async function save(readable: stream.Readable, name: string, type: string, hash: storageProps: { id: id }, - url: `${ config.drive.config.secure ? 'https' : 'http' }://${ config.drive.config.endPoint }${ config.drive.config.port ? ':' + config.drive.config.port : '' }/${ config.drive.bucket }/${ obj }` + url: `${ baseUrl }/${ obj }` }); const file = await DriveFile.insert({ |