Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-06 22:15:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1255 from theon/absolute-path-config

Browse Source 
Allow absolute config paths
This commit is contained in:
Julian Lam
2014-03-27 13:10:29 -04:00
parent 0e5c65199d 6ca5a42936
commit 1eab829dec
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app.js
View File

@@ -66,7 +66,7 @@ winston.info('');
var configFile = __dirname + '/config.json', var configFile = __dirname + '/config.json',
configExists; configExists;
if (nconf.get('config')) { if (nconf.get('config')) {
configFile = path.join(__dirname, nconf.get('config')); configFile = path.resolve(__dirname, nconf.get('config'));
} }
configExists = fs.existsSync(configFile); configExists = fs.existsSync(configFile);

2
src/install.js
View File

@@ -444,7 +444,7 @@ var async = require('async'),
save: function (server_conf, callback) { save: function (server_conf, callback) {
var serverConfigPath = path.join(__dirname, '../config.json'); var serverConfigPath = path.join(__dirname, '../config.json');
if (nconf.get('config')) { if (nconf.get('config')) {
serverConfigPath = path.join(__dirname, '../', nconf.get('config')); serverConfigPath = path.resolve(__dirname, '../', nconf.get('config'));
} }
fs.writeFile(serverConfigPath, JSON.stringify(server_conf, null, 4), function (err) { fs.writeFile(serverConfigPath, JSON.stringify(server_conf, null, 4), function (err) {