Merge pull request #675 from ahoka/master

Add Azure Blob Storage support

4 files changed, 14 insertions, 3 deletions

diff --git a/lib/config/default.js b/lib/config/default.js
index 68849d36..30ce2090 100644
--- a/lib/config/default.js
+++ b/lib/config/default.js
@@ -56,7 +56,7 @@ module.exports = {
   heartbeatTimeout: 10000,
   // document
   documentMaxLength: 100000,
-  // image upload setting, available options are imgur/s3/filesystem
+  // image upload setting, available options are imgur/s3/filesystem/azure
   imageUploadType: 'filesystem',
   imgur: {
     clientID: undefined
@@ -74,6 +74,10 @@ module.exports = {
     port: 9000
   },
   s3bucket: undefined,
+  azure: {
+    connectionString: undefined,
+    container: undefined
+  },
   // authentication
   facebook: {
     clientID: undefined,
diff --git a/lib/config/dockerSecret.js b/lib/config/dockerSecret.js
index b9116cd3..fd66ddfe 100644
--- a/lib/config/dockerSecret.js
+++ b/lib/config/dockerSecret.js
@@ -22,6 +22,9 @@ if (fs.existsSync(basePath)) {
       accessKeyId: getSecret('s3_acccessKeyId'),
       secretAccessKey: getSecret('s3_secretAccessKey')
     },
+    azure: {
+      connectionString: getSecret('azure_connectionString')
+    },
     facebook: {
       clientID: getSecret('facebook_clientID'),
       clientSecret: getSecret('facebook_clientSecret')
diff --git a/lib/config/environment.js b/lib/config/environment.js
index 3dde4786..810cb225 100644
--- a/lib/config/environment.js
+++ b/lib/config/environment.js
@@ -45,6 +45,10 @@ module.exports = {
     port: toIntegerConfig(process.env.HMD_MINIO_PORT)
   },
   s3bucket: process.env.HMD_S3_BUCKET,
+  azure: {
+    connectionString: process.env.HMD_AZURE_CONNECTION_STRING,
+    container: process.env.HMD_AZURE_CONTAINER
+  },
   facebook: {
     clientID: process.env.HMD_FACEBOOK_CLIENTID,
     clientSecret: process.env.HMD_FACEBOOK_CLIENTSECRET
diff --git a/lib/config/index.js b/lib/config/index.js
index bdba5e0e..f10eadb8 100644
--- a/lib/config/index.js
+++ b/lib/config/index.js
@@ -127,8 +127,8 @@ if (config.sessionSecret === 'secret') {
 }
 
 // Validate upload upload providers
-if (['filesystem', 's3', 'minio', 'imgur'].indexOf(config.imageUploadType) === -1) {
-  logger.error('"imageuploadtype" is not correctly set. Please use "filesystem", "s3", "minio" or "imgur". Defaulting to "imgur"')
+if (['filesystem', 's3', 'minio', 'imgur', 'azure'].indexOf(config.imageUploadType) === -1) {
+  logger.error('"imageuploadtype" is not correctly set. Please use "filesystem", "s3", "minio", "azure" or "imgur". Defaulting to "imgur"')
   config.imageUploadType = 'imgur'
 }