fix: config env vars parsing
This commit is contained in:
parent
20ef07bef3
commit
59ce39f033
@ -103,7 +103,7 @@ sessionSecret: 1234567890abcdefghijklmnopqrstuvxyz
|
||||
# Database Connection String
|
||||
# ---------------------------------------------------------------------
|
||||
|
||||
db: $(MONGO_URI)
|
||||
db: $(MONGODB_URI)
|
||||
|
||||
# ---------------------------------------------------------------------
|
||||
# Git Connection Info
|
||||
|
@ -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": {
|
||||
|
@ -12,7 +12,7 @@ module.exports = {
|
||||
parseConfigValue (cfg) {
|
||||
return _.replace(
|
||||
cfg,
|
||||
(/\$\([A-Z0-9_]+\)/g,
|
||||
(/\$\(([A-Z0-9_]+)\)/g,
|
||||
(m) => { return process.env[m] })
|
||||
)
|
||||
}
|
||||
|
@ -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'))
|
||||
|
Loading…
Reference in New Issue
Block a user