diff options
| author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-03-22 13:39:05 +0100 |
|---|---|---|
| committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-03-22 13:39:05 +0100 |
| commit | 64b197e6488e1ba1a48d63f365242d50c668ee13 (patch) | |
| tree | fbd6fb8d4d4cd337a4ffbec24d7f0530b5596de8 /environments/global/common.yaml | |
| parent | 5a1aab82ab45c14db40026bb7b1f19d0ee8a3cb3 (diff) | |
| parent | cdbbfd477be98497ca89233ca8b8b1c1e27e184b (diff) | |
| download | Puppet-64b197e6488e1ba1a48d63f365242d50c668ee13.tar.gz Puppet-64b197e6488e1ba1a48d63f365242d50c668ee13.tar.zst Puppet-64b197e6488e1ba1a48d63f365242d50c668ee13.zip | |
Merge branch 'xmpp_report' into dev
Diffstat (limited to 'environments/global/common.yaml')
| -rw-r--r-- | environments/global/common.yaml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/environments/global/common.yaml b/environments/global/common.yaml index 094e0ff..2dfe0aa 100644 --- a/environments/global/common.yaml +++ b/environments/global/common.yaml | |||
| @@ -29,6 +29,7 @@ base_installation::puppet_ssl_path: "/etc/puppetlabs/ssl" | |||
| 29 | base_installation::system_locales: ["fr_FR.UTF-8", "en_US.UTF-8"] | 29 | base_installation::system_locales: ["fr_FR.UTF-8", "en_US.UTF-8"] |
| 30 | base_installation::system_timezone: "Europe/Paris" | 30 | base_installation::system_timezone: "Europe/Paris" |
| 31 | base_installation::system_users: [] # Fetched via ldap | 31 | base_installation::system_users: [] # Fetched via ldap |
| 32 | base_installation::notify_xmpp: {} | ||
| 32 | profile::fstab::mounts: | 33 | profile::fstab::mounts: |
| 33 | - "%{facts.ldapvar.self.vars.mounts.0}" | 34 | - "%{facts.ldapvar.self.vars.mounts.0}" |
| 34 | - "%{facts.ldapvar.self.vars.mounts.1}" | 35 | - "%{facts.ldapvar.self.vars.mounts.1}" |