Merge pull request #248 from hackmdio/file-upload-options

Support other options for image uploading
This commit is contained in:
Max Wu 2016-11-27 10:54:00 +08:00 committed by GitHub
commit bd3d4958e4
14 changed files with 205 additions and 20 deletions

View file

@ -56,6 +56,17 @@ var heartbeattimeout = config.heartbeattimeout || 10000;
// document
var documentmaxlength = config.documentmaxlength || 100000;
// image upload setting, available options are imgur/s3/filesystem
var imageUploadType = process.env.HMD_IMAGE_UPLOAD_TYPE || config.imageUploadType || 'imgur';
config.s3 = config.s3 || {};
var s3 = {
accessKeyId: process.env.HMD_S3_ACCESS_KEY_ID || config.s3.accessKeyId,
secretAccessKey: process.env.HMD_S3_SECRET_ACCESS_KEY || config.s3.secretAccessKey,
region: process.env.HMD_S3_REGION || config.s3.region
}
var s3bucket = process.env.HMD_S3_BUCKET || config.s3.bucket;
// auth
var facebook = (process.env.HMD_FACEBOOK_CLIENTID && process.env.HMD_FACEBOOK_CLIENTSECRET) ? {
clientID: process.env.HMD_FACEBOOK_CLIENTID,
@ -139,5 +150,8 @@ module.exports = {
gitlab: gitlab,
dropbox: dropbox,
google: google,
imgur: imgur
imgur: imgur,
imageUploadType: imageUploadType,
s3: s3,
s3bucket: s3bucket
};