aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2018-08-18 14:02:17 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2018-08-18 14:02:17 +0200
commit3c90c9020fc4e0257fa4c73f14e609e3559b3771 (patch)
tree3819efff8336fdda1fef8fc78fd2fbc0791693af
parent7d8c507fd252d822cc92ca2168d71f97805cc30a (diff)
downloadPuppet-3c90c9020fc4e0257fa4c73f14e609e3559b3771.tar.gz
Puppet-3c90c9020fc4e0257fa4c73f14e609e3559b3771.tar.zst
Puppet-3c90c9020fc4e0257fa4c73f14e609e3559b3771.zip
Move private values
-rw-r--r--environments/global/common.yaml5
-rw-r--r--environments/global/roles/cryptoportfolio.yaml2
2 files changed, 2 insertions, 5 deletions
diff --git a/environments/global/common.yaml b/environments/global/common.yaml
index 97bf196..2f2db35 100644
--- a/environments/global/common.yaml
+++ b/environments/global/common.yaml
@@ -30,10 +30,7 @@ base_installation::system_locales: ["fr_FR.UTF-8", "en_US.UTF-8"]
30base_installation::system_timezone: "Europe/Paris" 30base_installation::system_timezone: "Europe/Paris"
31base_installation::system_users: [] # Fetched via ldap 31base_installation::system_users: [] # Fetched via ldap
32base_installation::notify_xmpp: {} 32base_installation::notify_xmpp: {}
33# FIXME: get all mounts without needing that hack? 33profile::fstab::mounts: []
34profile::fstab::mounts:
35 - "%{facts.ldapvar.self.vars.mounts.0}"
36 - "%{facts.ldapvar.self.vars.mounts.1}"
37profile::xmr_stak::mining_pool: "" 34profile::xmr_stak::mining_pool: ""
38profile::xmr_stak::wallet: "" 35profile::xmr_stak::wallet: ""
39profile::mail::mailhub: "" # Fetched via ldap 36profile::mail::mailhub: "" # Fetched via ldap
diff --git a/environments/global/roles/cryptoportfolio.yaml b/environments/global/roles/cryptoportfolio.yaml
index 138da7a..661af2d 100644
--- a/environments/global/roles/cryptoportfolio.yaml
+++ b/environments/global/roles/cryptoportfolio.yaml
@@ -6,7 +6,7 @@ role::cryptoportfolio::user: "cryptoportfolio"
6role::cryptoportfolio::group: "cryptoportfolio" 6role::cryptoportfolio::group: "cryptoportfolio"
7role::cryptoportfolio::home: "/home/cryptoportfolio" 7role::cryptoportfolio::home: "/home/cryptoportfolio"
8role::cryptoportfolio::env: "prod" 8role::cryptoportfolio::env: "prod"
9role::cryptoportfolio::webhook_url: "%{ldapvar.self.vars.cf_slack_webhook.0}" 9role::cryptoportfolio::webhook_url: ""
10role::cryptoportfolio::pg_db: "cryptoportfolio" 10role::cryptoportfolio::pg_db: "cryptoportfolio"
11role::cryptoportfolio::pg_user: "cryptoportfolio" 11role::cryptoportfolio::pg_user: "cryptoportfolio"
12role::cryptoportfolio::web_host: "%{lookup('base_installation::system_hostname')}" 12role::cryptoportfolio::web_host: "%{lookup('base_installation::system_hostname')}"