From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Fri, 13 Apr 2018 16:33:23 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=7771d1e19b7c4b0f0f8383a52ecf0d54d92e828d;hp=2a4d95bc9bc6d420e146ae64536a5b1fb23b01a8;p=perso%2FImmae%2FProjets%2FPuppet.git

Merge branch 'dev'
---

diff --git a/modules/profile/templates/xmr_stak/xmr-stak.conf.erb b/modules/profile/templates/xmr_stak/xmr-stak.conf.erb
index e483b0e..f6fae77 100644
--- a/modules/profile/templates/xmr_stak/xmr-stak.conf.erb
+++ b/modules/profile/templates/xmr_stak/xmr-stak.conf.erb
@@ -1,9 +1,9 @@
 "pool_list" :
 [
-{"pool_address" : "<%= @mining_pool %>", "wallet_address" : "<%= @wallet %>.<%= @instance %>", "pool_password" : "<%= @password %>", "use_nicehash" : false, "use_tls" : false, "tls_fingerprint" : "", "pool_weight" : 1 },
+{"pool_address" : "<%= @mining_pool %>", "wallet_address" : "<%= @wallet %>.<%= @instance %>", "rig_id": "", "pool_password" : "<%= @password %>", "use_nicehash" : false, "use_tls" : false, "tls_fingerprint" : "", "pool_weight" : 1 },
 ],
 
-"currency" : "monero",
+"currency" : "cryptonight",
 "call_timeout" : 10,
 "retry_time" : 30,
 "giveup_limit" : 0,
diff --git a/modules/profile/templates/xmr_stak/xmr-stak.service.erb b/modules/profile/templates/xmr_stak/xmr-stak.service.erb
index d63103b..33cb08d 100644
--- a/modules/profile/templates/xmr_stak/xmr-stak.service.erb
+++ b/modules/profile/templates/xmr_stak/xmr-stak.service.erb
@@ -8,7 +8,7 @@ WorkingDirectory=/var/lib/xmr_stak
 Type=simple
 User=xmr_stak
 Group=xmr_stak
-ExecStart=/usr/bin/cpulimit --limit <%= @cpulimit %> /usr/bin/xmr-stak -c /var/lib/xmr_stak/xmr-stak.conf
+ExecStart=/usr/bin/cpulimit --limit <%= @cpulimit %> /usr/bin/xmr-stak -C /var/lib/xmr_stak/xmr-stak.conf -c /var/lib/xmr_stak/xmr-stak.conf
 Nice=19
 
 [Install]