X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=environments%2Fglobal%2Fcommon.yaml;h=97bf19637c18dfd195f6dbb14458ee1f353e544b;hb=a7b985dd3cc4af68875733eb135335a31504f472;hp=4836f6ed88e2f6109188601eb33c905dfb8a83e6;hpb=98311fc2ea91cc2a5f00e9fa85a30f50fde77e79;p=perso%2FImmae%2FProjets%2FPuppet.git

diff --git a/environments/global/common.yaml b/environments/global/common.yaml
index 4836f6e..97bf196 100644
--- a/environments/global/common.yaml
+++ b/environments/global/common.yaml
@@ -1,6 +1,6 @@
 ---
 lookup_options:
-  base_installation::mounts:
+  profile::fstab::mounts:
     merge: unique
   classes:
     merge: deep
@@ -21,19 +21,21 @@ base_installation::ldap_dn: "cn=%{facts.ec2_metadata.hostname},ou=hosts,dc=immae
 base_installation::ldap_cn: "%{facts.ec2_metadata.hostname}"
 base_installation::ldap_server: "ldap.immae.eu"
 base_installation::ldap_uri: "ldaps://ldap.immae.eu"
-# FIXME: get all mounts without needing that hack?
-base_installation::mounts:
-  - "%{facts.ldapvar.self.vars.mounts.0}"
-  - "%{facts.ldapvar.self.vars.mounts.1}"
 base_installation::puppet_conf_path: "/etc/puppetlabs/puppet"
+base_installation::puppet_notifies_path: "/etc/puppetlabs/notifies"
 base_installation::puppet_code_path: "/etc/puppetlabs/code"
 base_installation::puppet_pass_seed: "/etc/puppetlabs/puppet/password_seed"
 base_installation::puppet_ssl_path: "/etc/puppetlabs/ssl"
 base_installation::system_locales: ["fr_FR.UTF-8", "en_US.UTF-8"]
 base_installation::system_timezone: "Europe/Paris"
 base_installation::system_users: [] # Fetched via ldap
-profile::xmr_stak::mining_pool: "" # Fetched via ldap
-profile::xmr_stak::wallet: "" # Fetched via ldap
+base_installation::notify_xmpp: {}
+# FIXME: get all mounts without needing that hack?
+profile::fstab::mounts:
+  - "%{facts.ldapvar.self.vars.mounts.0}"
+  - "%{facts.ldapvar.self.vars.mounts.1}"
+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