mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-20 15:36:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 27

Allow settings filename to be passed as a cli option

Browse source
This commit is contained in:
Jordan 2012-02-21 14:20:45 -05:00
parent 10cbb485fb
commit 8bac77ff80
4 changed files with 58 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
node/utils/Settings.js
View file

@ -22,6 +22,7 @@
var fs = require("fs");
var os = require("os");
var path = require('path');
var argv = require('./Cli').argv;
/**
* The IP ep-lite should listen to
@ -88,9 +89,12 @@ exports.abiwordAvailable = function()
}
}
// Discover where the settings file lives
var settingsFilename = argv.settings || "settings.json";
var settingsPath = settingsFilename.charAt(0) == '/' ? '' : path.normalize(__dirname + "/../../");
//read the settings sync
var settingsPath = path.normalize(__dirname + "/../../");
var settingsStr = fs.readFileSync(settingsPath + "settings.json").toString();
var settingsStr = fs.readFileSync(settingsPath + settingsFilename).toString();
//remove all comments
settingsStr = settingsStr.replace(/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+/gm,"").replace(/#.*/g,"").replace(/\/\/.*/g,"");