aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--environments/global/common.yaml4
-rw-r--r--modules/profile/manifests/postgresql.pp2
-rw-r--r--modules/profile/manifests/xmr_stak.pp11
-rw-r--r--modules/role/manifests/cryptoportfolio.pp4
4 files changed, 11 insertions, 10 deletions
diff --git a/environments/global/common.yaml b/environments/global/common.yaml
index 05d12ad..4536b83 100644
--- a/environments/global/common.yaml
+++ b/environments/global/common.yaml
@@ -35,7 +35,7 @@ base_installation::system_users:
35 - host: "immae.eu" 35 - host: "immae.eu"
36 key: "AAAAB3NzaC1yc2EAAAADAQABAAABAQDi5PgLBwMRyRwzJPnSgUyRAuB9AAxMijsw1pR/t/wmxQne1O5fIPOleHx+D8dyZbwm+XkzlcJpgT0Qy3qC9J8BPhshJvO/tA/8CI/oS/FE0uWsyACH1DMO2dk4gRRZGSE9IuzDMRPlnfZ3n0tdsPzzv3GH4It/oPIgsvkTowKztGLQ7Xmjr5BxzAhXcIQymqA0U3XWHSdWvnSRDaOFG0PDoVMS85IdwlviVKLnV5Sstb4NC/P28LFfgvW8DO/XrOqujgDomqTmR41dK/AyrGGOb2cQUMO4l8Oa+74aOyKaB61rr/rJkr+wCbEttkTvgFa6zZygSk3edfiWE2rgn4+v" 36 key: "AAAAB3NzaC1yc2EAAAADAQABAAABAQDi5PgLBwMRyRwzJPnSgUyRAuB9AAxMijsw1pR/t/wmxQne1O5fIPOleHx+D8dyZbwm+XkzlcJpgT0Qy3qC9J8BPhshJvO/tA/8CI/oS/FE0uWsyACH1DMO2dk4gRRZGSE9IuzDMRPlnfZ3n0tdsPzzv3GH4It/oPIgsvkTowKztGLQ7Xmjr5BxzAhXcIQymqA0U3XWHSdWvnSRDaOFG0PDoVMS85IdwlviVKLnV5Sstb4NC/P28LFfgvW8DO/XrOqujgDomqTmR41dK/AyrGGOb2cQUMO4l8Oa+74aOyKaB61rr/rJkr+wCbEttkTvgFa6zZygSk3edfiWE2rgn4+v"
37 key_type: "ssh-rsa" 37 key_type: "ssh-rsa"
38xmr_stak::mining_pool: "pool.minexmr.com:7777" 38profile::xmr_stak::mining_pool: "pool.minexmr.com:7777"
39xmr_stak::wallet: "44CA8TxTFYbQqN2kLyk8AnB6Ghz4mcbGpYC2EyXW7A8H9QspvWnTjDn39XUZDPrFwPa5JNwt4TmAxcooPWv4SaJqL87Bcdo" 39profile::xmr_stak::wallet: "44CA8TxTFYbQqN2kLyk8AnB6Ghz4mcbGpYC2EyXW7A8H9QspvWnTjDn39XUZDPrFwPa5JNwt4TmAxcooPWv4SaJqL87Bcdo"
40letsencrypt::email: "sites+letsencrypt@mail.immae.eu" 40letsencrypt::email: "sites+letsencrypt@mail.immae.eu"
41letsencrypt::try_for_real_hostname: true 41letsencrypt::try_for_real_hostname: true
diff --git a/modules/profile/manifests/postgresql.pp b/modules/profile/manifests/postgresql.pp
index 1024c66..9d875c9 100644
--- a/modules/profile/manifests/postgresql.pp
+++ b/modules/profile/manifests/postgresql.pp
@@ -1,5 +1,5 @@
1class profile::postgresql { 1class profile::postgresql {
2 $password_seed = lookup("base_installation::puppet_pass_seed") |$key| { {} } 2 $password_seed = lookup("base_installation::puppet_pass_seed")
3 3
4 class { '::postgresql::globals': 4 class { '::postgresql::globals':
5 encoding => 'UTF-8', 5 encoding => 'UTF-8',
diff --git a/modules/profile/manifests/xmr_stak.pp b/modules/profile/manifests/xmr_stak.pp
index e5582eb..c8bbcdd 100644
--- a/modules/profile/manifests/xmr_stak.pp
+++ b/modules/profile/manifests/xmr_stak.pp
@@ -1,4 +1,8 @@
1class profile::xmr_stak { 1class profile::xmr_stak (
2 String $mining_pool,
3 String $wallet,
4 Optional[String] $password = "x",
5) {
2 ensure_resource('exec', 'systemctl daemon-reload', { 6 ensure_resource('exec', 'systemctl daemon-reload', {
3 command => '/usr/bin/systemctl daemon-reload', 7 command => '/usr/bin/systemctl daemon-reload',
4 refreshonly => true 8 refreshonly => true
@@ -26,10 +30,7 @@ class profile::xmr_stak {
26 notify => Exec["systemctl daemon-reload"] 30 notify => Exec["systemctl daemon-reload"]
27 } 31 }
28 32
29 $mining_pool = lookup("xmr_stak::mining_pool") |$key| { {} } 33 $instance = regsubst(lookup("base_installation::ldap_cn"), '\.', "_", "G")
30 $wallet = lookup("xmr_stak::wallet") |$key| { {} }
31 $password = lookup("xmr_stak::password") |$key| { "x" }
32 $instance = regsubst($facts["ec2_metadata"]["hostname"], '\.', "_", "G")
33 34
34 file { "/var/lib/xmr_stak/xmr-stak.conf": 35 file { "/var/lib/xmr_stak/xmr-stak.conf":
35 mode => "0644", 36 mode => "0644",
diff --git a/modules/role/manifests/cryptoportfolio.pp b/modules/role/manifests/cryptoportfolio.pp
index 8b4a63b..5b64787 100644
--- a/modules/role/manifests/cryptoportfolio.pp
+++ b/modules/role/manifests/cryptoportfolio.pp
@@ -196,7 +196,7 @@ class role::cryptoportfolio (
196 cleanup => false, 196 cleanup => false,
197 extract => true, 197 extract => true,
198 user => $user, 198 user => $user,
199 username => $facts["ec2_metadata"]["hostname"], 199 username => lookup("base_installation::ldap_cn"),
200 password => generate_password(24, $password_seed, "ldap"), 200 password => generate_password(24, $password_seed, "ldap"),
201 extract_path => $cf_bot_app, 201 extract_path => $cf_bot_app,
202 require => [User["$user:"], File[$cf_bot_app]], 202 require => [User["$user:"], File[$cf_bot_app]],
@@ -329,7 +329,7 @@ class role::cryptoportfolio (
329 cleanup => false, 329 cleanup => false,
330 extract => true, 330 extract => true,
331 user => $user, 331 user => $user,
332 username => $facts["ec2_metadata"]["hostname"], 332 username => lookup("base_installation::ldap_cn"),
333 password => generate_password(24, $password_seed, "ldap"), 333 password => generate_password(24, $password_seed, "ldap"),
334 extract_path => $cf_front_app, 334 extract_path => $cf_front_app,
335 require => [User["$user:"], File[$cf_front_app]], 335 require => [User["$user:"], File[$cf_front_app]],