references 'granax' to comply with licensing requirements

This commit is contained in:
Zachary Boyd 2018-09-15 13:52:21 -04:00
parent d0fe557036
commit a9e8baa27f
3 changed files with 7 additions and 23 deletions

View file

@ -1,5 +1,10 @@
# Changelog # Changelog
## [4.0.3] - 2018-09-15
### Changed
- References granax in `default_config.js` to comply with licensing requirements.
## [4.0.2] - 2018-09-15 ## [4.0.2] - 2018-09-15
### Added ### Added

View file

@ -1,6 +1,6 @@
{ {
"name": "tor-router", "name": "tor-router",
"version": "4.0.2", "version": "4.0.3",
"main": "src/index.js", "main": "src/index.js",
"repository": "git@github.com:znetstar/tor-router.git", "repository": "git@github.com:znetstar/tor-router.git",
"author": "Zachary Boyd <zachary@zacharyboyd.nyc>", "author": "Zachary Boyd <zachary@zacharyboyd.nyc>",

View file

@ -21,28 +21,7 @@ module.exports = {
"Log": "notice stdout", "Log": "notice stdout",
"NewCircuitPeriod": "10" "NewCircuitPeriod": "10"
}, },
"torPath": (() => { "torPath": require('granax').tor(require('os').platform()),
let platform = require('os').platform();
let BIN_PATH = path.join(__dirname, '..', 'node_modules', 'granax', 'bin');
/**
* @author gordonhall on GitLab <https://bit.ly/2xcahjY>
*/
switch (platform) {
case 'win32':
return path.join(BIN_PATH, 'Browser', 'TorBrowser', 'Tor', 'tor.exe');
break;
case 'darwin':
return path.join(BIN_PATH, '.tbb.app', 'Contents', 'Resources',
'TorBrowser', 'Tor', 'tor');
break;
case 'android':
case 'linux':
return path.join(BIN_PATH, 'tor-browser_en-US', 'Browser', 'TorBrowser', 'Tor', 'tor');
break;
default:
return "tor";
}
})(),
"instances": null, "instances": null,
"dns": { "dns": {
"timeout": 10000, "timeout": 10000,