grassrootseconomics
/
ethstats-server
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #190 from cubedro/develop 

Updated trusted nodes
This commit is contained in:
Marian OANCΞA 2015-06-13 07:45:21 +03:00
parent fbad4a5bca 9b7efefb70
commit 25c9a2a4e7
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app.js
View File

@ -1,7 +1,7 @@
var _ = require('lodash');
var logger = require('./lib/utils/logger');
var chalk = require('chalk');
var http = require('http');
var WS_SECRET = process.env.WS_SECRET || "eth-net-stats-has-a-secret";
@ -10,11 +10,10 @@ var WS_SECRET = process.env.WS_SECRET || "eth-net-stats-has-a-secret";
if( process.env.NODE_ENV !== 'production' )
{
var app = require('./lib/express');
server = require('http').createServer(app);
server = http.createServer(app);
}
else
server = require('http').createServer();
server = http.createServer();
// Init socket vars
var Primus = require('primus');

17
lib/utils/config.js
View File

@ -1,13 +1,14 @@
var trusted = [
'54.94.239.50',
'52.16.188.185',
'52.4.40.229',
'52.4.131.128',
'52.0.243.36',
'52.4.180.23',
'52.5.60.7',
'52.5.26.21',
'52.5.25.137',
'54.94.239.50',
'52.7.164.228',
'52.7.84.201',
'54.164.66.158',
'54.172.106.147',
'54.165.231.82',
'54.165.244.62',
'54.165.246.230',
'54.165.236.161',
'::ffff:127.0.0.1',
];

3
src/js/directives.js
View File

@ -296,7 +296,8 @@ angular.module('netStatsApp.directives', [])
scope: {
data: '='
},
link: function(scope, element, attrs) {
link: function(scope, element, attrs)
{
var margin = {top: 0, right: 0, bottom: 0, left: 0};
var width = 280 - margin.left - margin.right,
height = 63 - margin.top - margin.bottom;