lukechilds
/
Agama
mirror of https://github.com/lukechilds/Agama.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

fixed merge conflicts

all-modes
pbca26 8 years ago
parent
bc33e0a676
commit
9935c81779
2 changed files with 230 additions and 212 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      main.js
  2. 432
      routes/shepherd.js

10
main.js
View File

@ -17,6 +17,8 @@ var express = require('express'),
fs = require('fs-extra'),
mkdirp = require('mkdirp'),
pm2 = require('pm2');
cluster = require('cluster');
numCPUs = require('os').cpus().length;
Promise = require('bluebird');
@ -61,6 +63,14 @@ guiapp.use('/gui', express.static(guipath));
guiapp.use('/shepherd', shepherd);
/*if (cluster.isMaster && process.env.NODE_ENV !== "development") {
for (var i = 0; i < numCPUs; i++) {
cluster.fork();
}
}
console.log(cluster)
*/
var rungui = guiapp.listen(appConfig.iguanaAppPort, function () {
console.log('guiapp listening on port ' + appConfig.iguanaAppPort + '!');
});

432
routes/shepherd.js
View File

@ -29,34 +29,37 @@ var iguanaConfsDirSrc = path.join(__dirname, '../assets/deps/confs'),
// SETTING OS DIR TO RUN IGUANA FROM
// SETTING APP ICON FOR LINUX AND WINDOWS
if (os.platform() === 'darwin') {
fixPath();
var iguanaBin = path.join(__dirname, '../assets/bin/osx/iguana'),
iguanaDir = process.env.HOME + '/Library/Application Support/iguana',
iguanaConfsDir = iguanaDir + '/confs',
komododBin = path.join(__dirname, '../assets/bin/osx/komodod'),
komodocliBin = path.join(__dirname, '../assets/bin/osx/komodo-cli'),
komodoDir = process.env.HOME + '/Library/Application Support/Komodo';
fixPath();
var iguanaBin = path.join(__dirname, '../assets/bin/osx/iguana'),
iguanaDir = process.env.HOME + '/Library/Application Support/iguana',
iguanaConfsDir = iguanaDir + '/confs',
komododBin = path.join(__dirname, '../assets/bin/osx/komodod'),
komodocliBin = path.join(__dirname, '../assets/bin/osx/komodo-cli'),
komodoDir = process.env.HOME + '/Library/Application Support/Komodo';
}
if (os.platform() === 'linux') {
var iguanaBin = path.join(__dirname, '../assets/bin/linux64/iguana'),
iguanaDir = process.env.HOME + '/.iguana',
iguanaConfsDir = iguanaDir + '/confs',
iguanaIcon = path.join(__dirname, '/assets/icons/iguana_app_icon_png/128x128.png'),
komododBin = path.join(__dirname, '../assets/bin/linux64/komodod'),
komodocliBin = path.join(__dirname, '../assets/bin/linux64/komodo-cli'),
komodoDir = process.env.HOME + '/.komodo';
var iguanaBin = path.join(__dirname, '../assets/bin/linux64/iguana'),
iguanaDir = process.env.HOME + '/.iguana',
iguanaConfsDir = iguanaDir + '/confs',
iguanaIcon = path.join(__dirname, '/assets/icons/iguana_app_icon_png/128x128.png'),
komododBin = path.join(__dirname, '../assets/bin/linux64/komodod'),
komodocliBin = path.join(__dirname, '../assets/bin/linux64/komodo-cli'),
komodoDir = process.env.HOME + '/.komodo';
}
if (os.platform() === 'win32') {
var iguanaBin = path.join(__dirname, '../assets/bin/win64/iguana.exe');
iguanaBin = path.normalize(iguanaBin);
var iguanaDir = process.env.APPDATA + '/iguana';
iguanaDir = path.normalize(iguanaDir);
var iguanaConfsDir = process.env.APPDATA + '/iguana/confs';
iguanaConfsDir = path.normalize(iguanaConfsDir);
var iguanaIcon = path.join(__dirname, '/assets/icons/iguana_app_icon.ico'),
iguanaConfsDirSrc = path.normalize(iguanaConfsDirSrc);
var iguanaBin = path.join(__dirname, '../assets/bin/win64/iguana.exe');
iguanaBin = path.normalize(iguanaBin);
iguanaDir = process.env.APPDATA + '/iguana';
iguanaDir = path.normalize(iguanaDir);
iguanaConfsDir = process.env.APPDATA + '/iguana/confs';
iguanaConfsDir = path.normalize(iguanaConfsDir);
iguanaIcon = path.join(__dirname, '/assets/icons/iguana_app_icon.ico'),
iguanaConfsDirSrc = path.normalize(iguanaConfsDirSrc);
komododBin = path.join(__dirname, '../assets/bin/win64/komodod.exe'),
komodocliBin = path.join(__dirname, '../assets/bin/win64/komodo-cli.exe'),
komodoDir = process.env.APPDATA + '/Komodo';
}
shepherd.appConfig = {
@ -673,218 +676,223 @@ shepherd.saveLocalAppConf = function(appSettings) {
}
function setConf(flock) {
console.log(flock);
if (os.platform() === 'darwin') {
var komodoDir = process.env.HOME + '/Library/Application Support/Komodo',
ZcashDir = process.env.HOME + '/Library/Application Support/Zcash';
}
if (os.platform() === 'linux') {
var komodoDir = process.env.HOME + '/.komodo',
ZcashDir = process.env.HOME + '/.zcash';
}
switch (flock) {
case 'komodod':
var DaemonConfPath = komodoDir + '/komodo.conf';
break;
case 'zcashd':
var DaemonConfPath = ZcashDir + '/zcash.conf';
break;
default:
var DaemonConfPath = komodoDir + '/' + flock + '/' + flock + '.conf';
}
console.log(DaemonConfPath);
var CheckFileExists = function() {
return new Promise(function(resolve, reject) {
var result = 'Check Conf file exists is done'
fs.ensureFile(DaemonConfPath, function(err) {
console.log(err); // => null
});
console.log(flock);
setTimeout(function() {
console.log(result);
resolve(result);
}, 2000);
});
}
var FixFilePermissions = function() {
return new Promise(function(resolve, reject) {
var result = 'Conf file permissions updated to Read/Write';
if (os.platform() === 'darwin') {
var komodoDir = process.env.HOME + '/Library/Application Support/Komodo',
ZcashDir = process.env.HOME + '/Library/Application Support/Zcash';
}
fsnode.chmodSync(DaemonConfPath, '0666');
if (os.platform() === 'linux') {
var komodoDir = process.env.HOME + '/.komodo',
ZcashDir = process.env.HOME + '/.zcash';
}
setTimeout(function() {
console.log(result);
resolve(result);
}, 1000);
});
}
if (os.platform() === 'win32') {
var komodoDir = process.env.APPDATA + '/Komodo',
ZcashDir = process.env.APPDATA + '/Zcash';
}
var RemoveLines = function() {
return new Promise(function(resolve, reject) {
var result = 'RemoveLines is done'
switch (flock) {
case 'komodod':
var DaemonConfPath = komodoDir + '/komodo.conf';
break;
case 'zcashd':
var DaemonConfPath = ZcashDir + '/zcash.conf';
break;
default:
var DaemonConfPath = komodoDir + '/' + flock + '/' + flock + '.conf';
}
fs.readFile(DaemonConfPath, 'utf8', function(err, data) {
if (err) {
return console.log(err);
}
console.log(DaemonConfPath);
var rmlines = data.replace(/(?:(?:\r\n|\r|\n)\s*){2}/gm, '\n');
var CheckFileExists = function() {
return new Promise(function(resolve, reject) {
var result = 'Check Conf file exists is done'
fs.writeFile(DaemonConfPath, rmlines, 'utf8', function(err) {
if (err)
return console.log(err);
});
});
fs.ensureFile(DaemonConfPath, function(err) {
console.log(err); // => null
});
fsnode.chmodSync(DaemonConfPath, '0666');
setTimeout(function() {
console.log(result);
resolve(result);
}, 2000);
});
}
setTimeout(function() {
console.log(result);
resolve(result);
}, 2000);
});
}
var CheckConf = function() {
return new Promise(function(resolve, reject) {
var result = 'CheckConf is done';
setconf.status(DaemonConfPath, function(err, status) {
//console.log(status[0]);
//console.log(status[0].rpcuser);
var rpcuser = function() {
return new Promise(function(resolve, reject) {
var result = 'checking rpcuser...';
if (status[0].hasOwnProperty('rpcuser')) {
console.log('rpcuser: OK');
} else {
console.log('rpcuser: NOT FOUND');
var randomstring = md5(Math.random() * Math.random() * 999);
fs.appendFile(DaemonConfPath, '\nrpcuser=user' + randomstring.substring(0, 16), (err) => {
if (err)
throw err;
console.log('rpcuser: ADDED');
});
}
var FixFilePermissions = function() {
return new Promise(function(resolve, reject) {
var result = 'Conf file permissions updated to Read/Write';
//console.log(result)
resolve(result);
});
}
fsnode.chmodSync(DaemonConfPath, '0666');
var rpcpass = function() {
return new Promise(function(resolve, reject) {
var result = 'checking rpcpass...';
if (status[0].hasOwnProperty('rpcpass')) {
console.log('rpcpass: OK');
} else {
console.log('rpcpass: NOT FOUND');
var randomstring = md5(Math.random() * Math.random() * 999);
fs.appendFile(DaemonConfPath, '\nrpcpass=' + randomstring +
'\nrpcpassword=' + randomstring, (err) => {
if (err)
throw err;
console.log('rpcpass: ADDED');
});
}
setTimeout(function() {
console.log(result);
resolve(result);
}, 1000);
});
}
//console.log(result)
resolve(result);
});
}
var RemoveLines = function() {
return new Promise(function(resolve, reject) {
var result = 'RemoveLines is done'
var server = function() {
return new Promise(function(resolve, reject) {
var result = 'checking server...';
if (status[0].hasOwnProperty('server')) {
console.log('server: OK');
} else {
console.log('server: NOT FOUND');
fs.appendFile(DaemonConfPath, '\nserver=1', (err) => {
if (err)
throw err;
console.log('server: ADDED');
});
}
fs.readFile(DaemonConfPath, 'utf8', function(err, data) {
if (err) {
return console.log(err);
}
//console.log(result)
resolve(result);
});
}
var rmlines = data.replace(/(?:(?:\r\n|\r|\n)\s*){2}/gm, '\n');
var addnode = function() {
return new Promise(function(resolve, reject) {
var result = 'checking addnode...';
if(status[0].hasOwnProperty('addnode')) {
console.log('addnode: OK');
} else {
console.log('addnode: NOT FOUND')
fs.appendFile(DaemonConfPath,
'\naddnode=78.47.196.146' +
'\naddnode=5.9.102.210' +
'\naddnode=178.63.69.164' +
'\naddnode=88.198.65.74' +
'\naddnode=5.9.122.241' +
'\naddnode=144.76.94.3',
(err) => {
if (err)
throw err;
console.log('addnode: ADDED');
});
}
fs.writeFile(DaemonConfPath, rmlines, 'utf8', function(err) {
if (err)
return console.log(err);
});
});
//console.log(result)
resolve(result);
});
}
fsnode.chmodSync(DaemonConfPath, '0666');
setTimeout(function() {
console.log(result);
resolve(result);
}, 2000);
});
}
rpcuser()
.then(function(result) {
return rpcpass();
})
.then(server)
.then(addnode)
});
var CheckConf = function() {
return new Promise(function(resolve, reject) {
var result = 'CheckConf is done';
setconf.status(DaemonConfPath, function(err, status) {
//console.log(status[0]);
//console.log(status[0].rpcuser);
var rpcuser = function() {
return new Promise(function(resolve, reject) {
var result = 'checking rpcuser...';
if (status[0].hasOwnProperty('rpcuser')) {
console.log('rpcuser: OK');
} else {
console.log('rpcuser: NOT FOUND');
var randomstring = md5(Math.random() * Math.random() * 999);
fs.appendFile(DaemonConfPath, '\nrpcuser=user' + randomstring.substring(0, 16), (err) => {
if (err)
throw err;
console.log('rpcuser: ADDED');
});
}
//console.log(result)
resolve(result);
});
}
var rpcpass = function() {
return new Promise(function(resolve, reject) {
var result = 'checking rpcpass...';
if (status[0].hasOwnProperty('rpcpass')) {
console.log('rpcpass: OK');
} else {
console.log('rpcpass: NOT FOUND');
var randomstring = md5(Math.random() * Math.random() * 999);
fs.appendFile(DaemonConfPath, '\nrpcpass=' + randomstring +
'\nrpcpassword=' + randomstring, (err) => {
if (err)
throw err;
console.log('rpcpass: ADDED');
});
}
//console.log(result)
resolve(result);
});
}
var server = function() {
return new Promise(function(resolve, reject) {
var result = 'checking server...';
if (status[0].hasOwnProperty('server')) {
console.log('server: OK');
} else {
console.log('server: NOT FOUND');
fs.appendFile(DaemonConfPath, '\nserver=1', (err) => {
if (err)
throw err;
console.log('server: ADDED');
});
}
//console.log(result)
resolve(result);
});
}
var addnode = function() {
return new Promise(function(resolve, reject) {
var result = 'checking addnode...';
if(status[0].hasOwnProperty('addnode')) {
console.log('addnode: OK');
} else {
console.log('addnode: NOT FOUND')
fs.appendFile(DaemonConfPath,
'\naddnode=78.47.196.146' +
'\naddnode=5.9.102.210' +
'\naddnode=178.63.69.164' +
'\naddnode=88.198.65.74' +
'\naddnode=5.9.122.241' +
'\naddnode=144.76.94.3',
(err) => {
if (err)
throw err;
console.log('addnode: ADDED');
});
}
//console.log(result)
resolve(result);
});
}
rpcuser()
.then(function(result) {
return rpcpass();
})
.then(server)
.then(addnode)
});
setTimeout(function() {
console.log(result);
resolve(result);
}, 2000);
});
}
setTimeout(function() {
console.log(result);
resolve(result);
}, 2000);
});
}
var MakeConfReadOnly = function() {
return new Promise(function(resolve, reject) {
var result = 'Conf file permissions updated to Read Only';
var MakeConfReadOnly = function() {
return new Promise(function(resolve, reject) {
var result = 'Conf file permissions updated to Read Only';
fsnode.chmodSync(DaemonConfPath, '0400');
fsnode.chmodSync(DaemonConfPath, '0400');
setTimeout(function() {
console.log(result);
resolve(result);
}, 1000);
});
}
setTimeout(function() {
console.log(result);
resolve(result);
}, 1000);
});
}
CheckFileExists()
.then(function(result) {
return FixFilePermissions();
})
.then(RemoveLines)
.then(CheckConf)
.then(MakeConfReadOnly);
CheckFileExists()
.then(function(result) {
return FixFilePermissions();
})
.then(RemoveLines)
.then(CheckConf)
.then(MakeConfReadOnly);
}
function getConf(flock) {

Write Preview
Loading…
Cancel
Save