fix: config env vars parsing

This commit is contained in:
NGPixel 2017-05-14 21:20:40 -04:00
parent 20ef07bef3
commit 59ce39f033
4 changed files with 6 additions and 16 deletions

View File

@ -103,7 +103,7 @@ sessionSecret: 1234567890abcdefghijklmnopqrstuvxyz
# Database Connection String
# ---------------------------------------------------------------------
db: $(MONGO_URI)
db: $(MONGODB_URI)
# ---------------------------------------------------------------------
# Git Connection Info

View File

@ -1,6 +1,6 @@
{
"name": "wiki.js",
"version": "1.0.0-beta.12",
"version": "1.0.0-beta.12.1",
"description": "A modern, lightweight and powerful wiki app built on NodeJS, Git and Markdown",
"main": "install.js",
"scripts": {

View File

@ -12,7 +12,7 @@ module.exports = {
parseConfigValue (cfg) {
return _.replace(
cfg,
(/\$\([A-Z0-9_]+\)/g,
(/\$\(([A-Z0-9_]+)\)/g,
(m) => { return process.env[m] })
)
}

View File

@ -4,15 +4,7 @@ const fs = require('fs')
const yaml = require('js-yaml')
const _ = require('lodash')
const path = require('path')
const deepMap = (obj, iterator, context) => {
return _.transform(obj, (result, val, key) => {
result[key] = _.isObject(val)
? deepMap(val, iterator, context)
: iterator.call(context, val, key, obj)
})
}
_.mixin({ deepMap })
const cfgHelper = require('../helpers/config')
/**
* Load Application Configuration
@ -32,10 +24,8 @@ module.exports = (confPaths) => {
try {
appconfig = yaml.safeLoad(
_.replace(
fs.readFileSync(confPaths.config, 'utf8'),
(/\$\([A-Z0-9_]+\)/g,
(m) => { return process.env[m] })
cfgHelper.parseConfigValue(
fs.readFileSync(confPaths.config, 'utf8')
)
)
appdata = yaml.safeLoad(fs.readFileSync(confPaths.data, 'utf8'))