Merge pull request #506 from erasys/minio

Add support for minio
This commit is contained in:
Christoph (Sheogorath) Kern 2018-01-23 11:43:24 +01:00 committed by GitHub
commit eec2318bda
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 49 additions and 0 deletions

View file

@ -62,6 +62,13 @@ module.exports = {
secretAccessKey: undefined, secretAccessKey: undefined,
region: undefined region: undefined
}, },
minio: {
accessKey: undefined,
secretKey: undefined,
endPoint: undefined,
secure: true,
port: 9000
},
s3bucket: undefined, s3bucket: undefined,
// authentication // authentication
facebook: { facebook: {

View file

@ -34,6 +34,13 @@ module.exports = {
secretAccessKey: process.env.HMD_S3_SECRET_ACCESS_KEY, secretAccessKey: process.env.HMD_S3_SECRET_ACCESS_KEY,
region: process.env.HMD_S3_REGION region: process.env.HMD_S3_REGION
}, },
minio: {
accessKey: process.env.HMD_MINIO_ACCESS_KEY,
secretKey: process.env.HMD_MINIO_SECRET_KEY,
endPoint: process.env.HMD_MINIO_ENDPOINT,
secure: toBooleanConfig(process.env.HMD_MINIO_SECURE),
port: parseInt(process.env.HMD_MINIO_PORT)
},
s3bucket: process.env.HMD_S3_BUCKET, s3bucket: process.env.HMD_S3_BUCKET,
facebook: { facebook: {
clientID: process.env.HMD_FACEBOOK_CLIENTID, clientID: process.env.HMD_FACEBOOK_CLIENTID,

View file

@ -73,6 +73,40 @@ imageRouter.post('/uploadimage', function (req, res) {
}) })
}) })
break break
case 'minio':
var utils = require('../utils')
var Minio = require('minio')
var minioClient = new Minio.Client({
endPoint: config.minio.endPoint,
port: config.minio.port,
secure: config.minio.secure,
accessKey: config.minio.accessKey,
secretKey: config.minio.secretKey
})
fs.readFile(files.image.path, function (err, buffer) {
if (err) {
logger.error(err)
res.status(500).end('upload image error')
return
}
var key = path.join('uploads', path.basename(files.image.path))
var protocol = config.minio.secure ? 'https' : 'http'
minioClient.putObject(config.s3bucket, key, buffer, buffer.size, utils.getImageMimeType(files.image.path), function (err, data) {
if (err) {
logger.error(err)
res.status(500).end('upload image error')
return
}
res.send({
link: `${protocol}://${config.minio.endPoint}:${config.minio.port}/${config.s3bucket}/${key}`
})
})
})
break
case 'imgur': case 'imgur':
default: default:
imgur.setClientId(config.imgur.clientID) imgur.setClientId(config.imgur.clientID)

View file

@ -79,6 +79,7 @@
"mattermost": "^3.4.0", "mattermost": "^3.4.0",
"meta-marked": "^0.4.2", "meta-marked": "^0.4.2",
"method-override": "^2.3.7", "method-override": "^2.3.7",
"minio": "^3.1.3",
"moment": "^2.17.1", "moment": "^2.17.1",
"morgan": "^1.7.0", "morgan": "^1.7.0",
"mysql": "^2.12.0", "mysql": "^2.12.0",