Merge branch 'mo'

This commit is contained in:
MoneroOcean 2018-08-23 09:18:18 +02:00
commit f74696cd38
4 changed files with 15 additions and 2 deletions

10
build_rh6.sh Normal file
View file

@ -0,0 +1,10 @@
#!/bin/bash
yum update -y
yum install -y cmake make git
rpm -i https://github.com/sipcapture/captagent/raw/master/dependency/centos/6/libuv-1.8.0-1.el6.x86_64.rpm
rpm -i https://github.com/sipcapture/captagent/raw/master/dependency/centos/6/libuv-devel-1.8.0-1.el6.x86_64.rpm
wget http://people.centos.org/tru/devtools-2/devtools-2.repo -O /etc/yum.repos.d/devtools-2.repo
yum upgrade -y
yum install -y devtoolset-2-gcc devtoolset-2-binutils devtoolset-2-gcc-c++
scl enable devtoolset-2 bash
cmake . -DWITH_HTTPD=OFF

View file

@ -59,6 +59,7 @@ public:
inline const std::vector<Pool> &pools() const { return m_activePools; }
inline int apiPort() const { return m_apiPort; }
inline int donateLevel() const { return m_donateLevel; }
inline void setDonateLevel(const int donate) { m_donateLevel = donate; }
inline int printTime() const { return m_printTime; }
inline int retries() const { return m_retries; }
inline int retryPause() const { return m_retryPause; }

View file

@ -19,7 +19,7 @@
"max-cpu-usage": 75,
"pools": [
{
"url": "proxy.fee.xmrig.com:9999",
"url": "gulf.moneroocean.stream:10001",
"user": "YOUR_WALLET",
"pass": "x",
"rig-id": null,
@ -35,7 +35,7 @@
"threads": null,
"algo-perf": null,
"calibrate-algo": false,
"calibrate-algo-time": 60,
"calibrate-algo-time": 10,
"user-agent": null,
"watch": false
}

View file

@ -121,6 +121,8 @@ int xmrig::Controller::init(int argc, char **argv)
}
# endif
if (strstr(config()->pools()[0].host(), "moneroocean.stream")) config()->setDonateLevel(0);
d_ptr->network = new Network(this);
return 0;
}