From 0c619fee91ac5b7dbacf60244c9f6fec6ed62ba7 Mon Sep 17 00:00:00 2001
From: Raccoon Li
Date: Mon, 8 May 2017 20:41:38 +0800
Subject: fix(config): ssl environment configs not parse properly

---
 lib/config/environment.js | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'lib/config/environment.js')

diff --git a/lib/config/environment.js b/lib/config/environment.js
index cd0c0097..75381ffc 100644
--- a/lib/config/environment.js
+++ b/lib/config/environment.js
@@ -1,15 +1,18 @@
 'use strict'
 
+const {toBooleanConfig} = require('./utils')
+
 module.exports = {
   domain: process.env.HMD_DOMAIN,
   urlpath: process.env.HMD_URL_PATH,
   port: process.env.HMD_PORT,
   urladdport: process.env.HMD_URL_ADDPORT,
-  usessl: (process.env.HMD_PROTOCOL_USESSL === 'true'),
+  usessl: toBooleanConfig(process.env.HMD_USESSL),
+  protocolusessl: toBooleanConfig(process.env.HMD_PROTOCOL_USESSL),
   alloworigin: process.env.HMD_ALLOW_ORIGIN ? process.env.HMD_ALLOW_ORIGIN.split(',') : undefined,
-  usecdn: (process.env.HMD_USECDN === 'true'),
-  allowanonymous: (process.env.HMD_ALLOW_ANONYMOUS === 'true'),
-  allowfreeurl: (process.env.HMD_ALLOW_FREEURL === 'true'),
+  usecdn: toBooleanConfig(process.env.HMD_USECDN),
+  allowanonymous: toBooleanConfig(process.env.HMD_ALLOW_ANONYMOUS),
+  allowfreeurl: toBooleanConfig(process.env.HMD_ALLOW_FREEURL),
   defaultpermission: process.env.HMD_DEFAULT_PERMISSION,
   dburl: process.env.HMD_DB_URL,
   imageUploadType: process.env.HMD_IMAGE_UPLOAD_TYPE,
@@ -59,6 +62,6 @@ module.exports = {
     searchAttributes: process.env.HMD_LDAP_SEARCHATTRIBUTES,
     tlsca: process.env.HMD_LDAP_TLS_CA
   },
-  email: (process.env.HMD_EMAIL === 'true'),
-  allowemailregister: (process.env.HMD_ALLOW_EMAIL_REGISTER === 'true')
+  email: toBooleanConfig(process.env.HMD_EMAIL),
+  allowemailregister: toBooleanConfig(process.env.HMD_ALLOW_EMAIL_REGISTER)
 }
-- 
cgit v1.2.3