4 files changed, 50 insertions, 48 deletions

diff --git a/environments/global/common.yaml b/environments/global/common.yaml
index 2dfe0aa..3cc75fa 100644
--- a/environments/global/common.yaml
+++ b/environments/global/common.yaml
@@ -33,8 +33,8 @@ base_installation::notify_xmpp: {}
 profile::fstab::mounts:
   - "%{facts.ldapvar.self.vars.mounts.0}"
   - "%{facts.ldapvar.self.vars.mounts.1}"
-profile::xmr_stak::mining_pool: "" # Fetched via ldap
-profile::xmr_stak::wallet: "" # Fetched via ldap
+profile::xmr_stak::mining_pool: ""
+profile::xmr_stak::wallet: ""
 profile::mail::mailhub: "" # Fetched via ldap
 role::backup::mailto: "" # Fetched via ldap
 role::backup::backups: [] # Fetched via ldap
diff --git a/environments/global/types/s1-2.yaml b/environments/global/types/s1-2.yaml
index 5bfdf9a..fb0d663 100644
--- a/environments/global/types/s1-2.yaml
+++ b/environments/global/types/s1-2.yaml
@@ -7,4 +7,4 @@ base_installation::system_hostname: "%{ldapvar.self.vars.host.0}"
 base_installation::real_hostname: "%{facts.ec2_metadata.hostname}.v.immae.eu"
 base_installation::ldap_cert_path: "/etc/ssl/certs/ca-certificates.crt"
 letsencrypt::try_for_real_hostname: true
-profile::xmr_stak::cpulimit: "30"
+profile::xmr_stak::cpulimit: "0"
diff --git a/modules/profile/manifests/xmr_stak.pp b/modules/profile/manifests/xmr_stak.pp
index ccb6baa..afa72a5 100644
--- a/modules/profile/manifests/xmr_stak.pp
+++ b/modules/profile/manifests/xmr_stak.pp
@@ -4,56 +4,58 @@ class profile::xmr_stak (
   Optional[String] $cpulimit = "50",
   Optional[String] $password = "x",
 ) {
-  ensure_resource('exec', 'systemctl daemon-reload', {
-    command     => '/usr/bin/systemctl daemon-reload',
-    refreshonly =>  true
-  })
+  unless empty($mining_pool) or $cpulimit == "0" {
+    ensure_resource('exec', 'systemctl daemon-reload', {
+      command     => '/usr/bin/systemctl daemon-reload',
+      refreshonly =>  true
+    })
 
-  ensure_packages(["cpulimit"])
-  aur::package { "xmr-stak_cpu": }
+    ensure_packages(["cpulimit"])
+    aur::package { "xmr-stak_cpu": }
 
-  user { "xmr_stak":
-    name       => "xmr_stak",
-    ensure     => "present",
-    managehome => true,
-    home       => "/var/lib/xmr_stak",
-    system     => true,
-    password   => "!!",
-    require    => Aur::Package["xmr-stak_cpu"],
-  }
+    user { "xmr_stak":
+      name       => "xmr_stak",
+      ensure     => "present",
+      managehome => true,
+      home       => "/var/lib/xmr_stak",
+      system     => true,
+      password   => "!!",
+      require    => Aur::Package["xmr-stak_cpu"],
+    }
 
-  file { "/etc/systemd/system/xmr-stak.service":
-    mode    => "0644",
-    owner   => "root",
-    group   => "root",
-    content => template("profile/xmr_stak/xmr-stak.service.erb"),
-    require => User["xmr_stak"],
-    notify  => Exec["systemctl daemon-reload"]
-  }
+    file { "/etc/systemd/system/xmr-stak.service":
+      mode    => "0644",
+      owner   => "root",
+      group   => "root",
+      content => template("profile/xmr_stak/xmr-stak.service.erb"),
+      require => User["xmr_stak"],
+      notify  => Exec["systemctl daemon-reload"]
+    }
 
-  $instance = regsubst(lookup("base_installation::ldap_cn"), '\.', "_", "G")
+    $instance = regsubst(lookup("base_installation::ldap_cn"), '\.', "_", "G")
 
-  file { "/var/lib/xmr_stak/xmr-stak.conf":
-    mode    => "0644",
-    owner   => "root",
-    group   => "root",
-    content => template("profile/xmr_stak/xmr-stak.conf.erb"),
-    require => User["xmr_stak"],
-  }
+    file { "/var/lib/xmr_stak/xmr-stak.conf":
+      mode    => "0644",
+      owner   => "root",
+      group   => "root",
+      content => template("profile/xmr_stak/xmr-stak.conf.erb"),
+      require => User["xmr_stak"],
+    }
 
-  service { "xmr-stak":
-    enable    => true,
-    ensure    => "running",
-    subscribe => [
-      Aur::Package["xmr-stak_cpu"],
-      File["/var/lib/xmr_stak/xmr-stak.conf"],
-      File["/etc/systemd/system/xmr-stak.service"]
-    ],
-    require   => [
-      Aur::Package["xmr-stak_cpu"],
-      File["/var/lib/xmr_stak/xmr-stak.conf"],
-      File["/etc/systemd/system/xmr-stak.service"]
-    ]
+    service { "xmr-stak":
+      enable    => true,
+      ensure    => "running",
+      subscribe => [
+        Aur::Package["xmr-stak_cpu"],
+        File["/var/lib/xmr_stak/xmr-stak.conf"],
+        File["/etc/systemd/system/xmr-stak.service"]
+      ],
+      require   => [
+        Aur::Package["xmr-stak_cpu"],
+        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 0228eb6..a1420f2 100644
--- a/modules/profile/templates/xmr_stak/xmr-stak.conf.erb
+++ b/modules/profile/templates/xmr_stak/xmr-stak.conf.erb
@@ -1,6 +1,6 @@
 "pool_list" :
 [
-{"pool_address" : "<%= @mining_pool %>", "wallet_address" : "<%= @wallet %>.<%= @instance %>", "rig_id": "", "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" : true, "tls_fingerprint" : "", "pool_weight" : 1 },
 ],
 
 "currency" : "monero7",