From: Ismaƫl Bouya Date: Wed, 31 Oct 2018 08:57:18 +0000 (+0100) Subject: Switch xmr stak cpu to xmr stak X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FProjets%2FPuppet.git;a=commitdiff_plain;h=42c7bdd646cc90d156a2f02176a539540ffaaf48 Switch xmr stak cpu to xmr stak --- diff --git a/modules/profile/manifests/xmr_stak.pp b/modules/profile/manifests/xmr_stak.pp index afa72a5..93aa37d 100644 --- a/modules/profile/manifests/xmr_stak.pp +++ b/modules/profile/manifests/xmr_stak.pp @@ -11,7 +11,16 @@ class profile::xmr_stak ( }) ensure_packages(["cpulimit"]) - aur::package { "xmr-stak_cpu": } + aur::package { "xmr-stak_cpu": + ensure => "absent" + } -> + aur::package { "xmr-stak": } + ~> + exec { "remove cpu.txt": + command => "/usr/bin/rm /var/lib/xmr_stak/cpu.txt", + refreshonly => true, + before => Service["xmr-stak"], + } user { "xmr_stak": name => "xmr_stak", @@ -20,7 +29,7 @@ class profile::xmr_stak ( home => "/var/lib/xmr_stak", system => true, password => "!!", - require => Aur::Package["xmr-stak_cpu"], + require => Aur::Package["xmr-stak"], } file { "/etc/systemd/system/xmr-stak.service": @@ -46,12 +55,12 @@ class profile::xmr_stak ( enable => true, ensure => "running", subscribe => [ - Aur::Package["xmr-stak_cpu"], + Aur::Package["xmr-stak"], File["/var/lib/xmr_stak/xmr-stak.conf"], File["/etc/systemd/system/xmr-stak.service"] ], require => [ - Aur::Package["xmr-stak_cpu"], + Aur::Package["xmr-stak"], File["/var/lib/xmr_stak/xmr-stak.conf"], File["/etc/systemd/system/xmr-stak.service"] ] diff --git a/modules/profile/templates/xmr_stak/xmr-stak.conf.erb b/modules/profile/templates/xmr_stak/xmr-stak.conf.erb index a1420f2..b9d75a5 100644 --- a/modules/profile/templates/xmr_stak/xmr-stak.conf.erb +++ b/modules/profile/templates/xmr_stak/xmr-stak.conf.erb @@ -3,7 +3,7 @@ {"pool_address" : "<%= @mining_pool %>", "wallet_address" : "<%= @wallet %>.<%= @instance %>", "rig_id": "", "pool_password" : "<%= @password %>", "use_nicehash" : false, "use_tls" : true, "tls_fingerprint" : "", "pool_weight" : 1 }, ], -"currency" : "monero7", +"currency" : "monero", "call_timeout" : 10, "retry_time" : 30, "giveup_limit" : 0,