Cleanup xmr_stak profile

diff --git a/environments/global/common.yaml b/environments/global/common.yaml
index 05d12ad77b2ce18b86a265a65e560d08906d706a..4536b83fcd7821c351cb7649560be59c1418df28 100644 (file)
--- a/environments/global/common.yaml
+++ b/environments/global/common.yaml
@@ -35,7 +35,7 @@ base_installation::system_users:
       - host: "immae.eu"
         key: "AAAAB3NzaC1yc2EAAAADAQABAAABAQDi5PgLBwMRyRwzJPnSgUyRAuB9AAxMijsw1pR/t/wmxQne1O5fIPOleHx+D8dyZbwm+XkzlcJpgT0Qy3qC9J8BPhshJvO/tA/8CI/oS/FE0uWsyACH1DMO2dk4gRRZGSE9IuzDMRPlnfZ3n0tdsPzzv3GH4It/oPIgsvkTowKztGLQ7Xmjr5BxzAhXcIQymqA0U3XWHSdWvnSRDaOFG0PDoVMS85IdwlviVKLnV5Sstb4NC/P28LFfgvW8DO/XrOqujgDomqTmR41dK/AyrGGOb2cQUMO4l8Oa+74aOyKaB61rr/rJkr+wCbEttkTvgFa6zZygSk3edfiWE2rgn4+v"
         key_type: "ssh-rsa"
-xmr_stak::mining_pool: "pool.minexmr.com:7777"
-xmr_stak::wallet: "44CA8TxTFYbQqN2kLyk8AnB6Ghz4mcbGpYC2EyXW7A8H9QspvWnTjDn39XUZDPrFwPa5JNwt4TmAxcooPWv4SaJqL87Bcdo"
+profile::xmr_stak::mining_pool: "pool.minexmr.com:7777"
+profile::xmr_stak::wallet: "44CA8TxTFYbQqN2kLyk8AnB6Ghz4mcbGpYC2EyXW7A8H9QspvWnTjDn39XUZDPrFwPa5JNwt4TmAxcooPWv4SaJqL87Bcdo"
 letsencrypt::email: "sites+letsencrypt@mail.immae.eu"
 letsencrypt::try_for_real_hostname: true

diff --git a/modules/profile/manifests/postgresql.pp b/modules/profile/manifests/postgresql.pp
index 1024c6657c62ee3f71b1ed1b191efa5bf9fc4574..9d875c98de23feeff9b1468773c372cd37a0d42b 100644 (file)
--- a/modules/profile/manifests/postgresql.pp
+++ b/modules/profile/manifests/postgresql.pp
@@ -1,5 +1,5 @@
 class profile::postgresql {
-  $password_seed = lookup("base_installation::puppet_pass_seed") |$key| { {} }
+  $password_seed = lookup("base_installation::puppet_pass_seed")
 
   class { '::postgresql::globals':
     encoding             => 'UTF-8',

diff --git a/modules/profile/manifests/xmr_stak.pp b/modules/profile/manifests/xmr_stak.pp
index e5582eb4a7d25c6a00144258309e7c170f9168ab..c8bbcdd39c26bfd5081aae5003f9a3c26ffdfbd4 100644 (file)
--- a/modules/profile/manifests/xmr_stak.pp
+++ b/modules/profile/manifests/xmr_stak.pp
@@ -1,4 +1,8 @@
-class profile::xmr_stak {
+class profile::xmr_stak (
+  String           $mining_pool,
+  String           $wallet,
+  Optional[String] $password = "x",
+) {
   ensure_resource('exec', 'systemctl daemon-reload', {
     command     => '/usr/bin/systemctl daemon-reload',
     refreshonly =>  true
@@ -26,10 +30,7 @@ class profile::xmr_stak {
     notify  => Exec["systemctl daemon-reload"]
   }
 
-  $mining_pool = lookup("xmr_stak::mining_pool") |$key| { {} }
-  $wallet = lookup("xmr_stak::wallet") |$key| { {} }
-  $password = lookup("xmr_stak::password") |$key| { "x" }
-  $instance = regsubst($facts["ec2_metadata"]["hostname"], '\.', "_", "G")
+  $instance = regsubst(lookup("base_installation::ldap_cn"), '\.', "_", "G")
 
   file { "/var/lib/xmr_stak/xmr-stak.conf":
     mode    => "0644",

diff --git a/modules/role/manifests/cryptoportfolio.pp b/modules/role/manifests/cryptoportfolio.pp
index 8b4a63b649b0dd46968446f2bc358e54f90582ce..5b6478787e7a552f22a4b4efb6f97e51a9616202 100644 (file)
--- a/modules/role/manifests/cryptoportfolio.pp
+++ b/modules/role/manifests/cryptoportfolio.pp
@@ -196,7 +196,7 @@ class role::cryptoportfolio (
       cleanup       => false,
       extract       => true,
       user          => $user,
-      username      => $facts["ec2_metadata"]["hostname"],
+      username      => lookup("base_installation::ldap_cn"),
       password      => generate_password(24, $password_seed, "ldap"),
       extract_path  => $cf_bot_app,
       require       => [User["$user:"], File[$cf_bot_app]],
@@ -329,7 +329,7 @@ class role::cryptoportfolio (
       cleanup       => false,
       extract       => true,
       user          => $user,
-      username      => $facts["ec2_metadata"]["hostname"],
+      username      => lookup("base_installation::ldap_cn"),
       password      => generate_password(24, $password_seed, "ldap"),
       extract_path  => $cf_front_app,
       require       => [User["$user:"], File[$cf_front_app]],