diff options
| author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-03-19 16:21:45 +0100 |
|---|---|---|
| committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-03-19 16:21:45 +0100 |
| commit | f4c9ed4c0a32082d8f7b60cee1eb33cb05c85a1c (patch) | |
| tree | c748ce388c30aa84cc15290aec65b8d3d9542f5d /environments | |
| parent | 433e9279d165bf225c597834b5a7c7ae64c11a27 (diff) | |
| parent | 97103ded8390d10ea3468615c654e89d07c0a921 (diff) | |
| download | Puppet-f4c9ed4c0a32082d8f7b60cee1eb33cb05c85a1c.tar.gz Puppet-f4c9ed4c0a32082d8f7b60cee1eb33cb05c85a1c.tar.zst Puppet-f4c9ed4c0a32082d8f7b60cee1eb33cb05c85a1c.zip | |
Merge branch 'ldap_lookup' into dev
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/global/common.yaml | 15 | ||||
| -rw-r--r-- | environments/hiera.yaml | 3 |
2 files changed, 7 insertions, 11 deletions
diff --git a/environments/global/common.yaml b/environments/global/common.yaml index 4536b83..5911194 100644 --- a/environments/global/common.yaml +++ b/environments/global/common.yaml | |||
| @@ -27,15 +27,8 @@ base_installation::puppet_pass_seed: "/etc/puppetlabs/puppet/password_seed" | |||
| 27 | base_installation::puppet_ssl_path: "/etc/puppetlabs/ssl" | 27 | base_installation::puppet_ssl_path: "/etc/puppetlabs/ssl" |
| 28 | base_installation::system_locales: ["fr_FR.UTF-8", "en_US.UTF-8"] | 28 | base_installation::system_locales: ["fr_FR.UTF-8", "en_US.UTF-8"] |
| 29 | base_installation::system_timezone: "Europe/Paris" | 29 | base_installation::system_timezone: "Europe/Paris" |
| 30 | base_installation::system_users: | 30 | base_installation::system_users: [] # Fetched via ldap |
| 31 | - userid: 1000 | 31 | profile::xmr_stak::mining_pool: "" # Fetched via ldap |
| 32 | username: "immae" | 32 | profile::xmr_stak::wallet: "" # Fetched via ldap |
| 33 | groups: ["wheel"] | 33 | letsencrypt::email: ~ # Fetched via ldap |
| 34 | keys: | ||
| 35 | - host: "immae.eu" | ||
| 36 | key: "AAAAB3NzaC1yc2EAAAADAQABAAABAQDi5PgLBwMRyRwzJPnSgUyRAuB9AAxMijsw1pR/t/wmxQne1O5fIPOleHx+D8dyZbwm+XkzlcJpgT0Qy3qC9J8BPhshJvO/tA/8CI/oS/FE0uWsyACH1DMO2dk4gRRZGSE9IuzDMRPlnfZ3n0tdsPzzv3GH4It/oPIgsvkTowKztGLQ7Xmjr5BxzAhXcIQymqA0U3XWHSdWvnSRDaOFG0PDoVMS85IdwlviVKLnV5Sstb4NC/P28LFfgvW8DO/XrOqujgDomqTmR41dK/AyrGGOb2cQUMO4l8Oa+74aOyKaB61rr/rJkr+wCbEttkTvgFa6zZygSk3edfiWE2rgn4+v" | ||
| 37 | key_type: "ssh-rsa" | ||
| 38 | profile::xmr_stak::mining_pool: "pool.minexmr.com:7777" | ||
| 39 | profile::xmr_stak::wallet: "44CA8TxTFYbQqN2kLyk8AnB6Ghz4mcbGpYC2EyXW7A8H9QspvWnTjDn39XUZDPrFwPa5JNwt4TmAxcooPWv4SaJqL87Bcdo" | ||
| 40 | letsencrypt::email: "sites+letsencrypt@mail.immae.eu" | ||
| 41 | letsencrypt::try_for_real_hostname: true | 34 | letsencrypt::try_for_real_hostname: true |
diff --git a/environments/hiera.yaml b/environments/hiera.yaml index 5a9a6d6..eda5eb3 100644 --- a/environments/hiera.yaml +++ b/environments/hiera.yaml | |||
| @@ -9,6 +9,9 @@ hierarchy: | |||
| 9 | - name: "Initialization variables" | 9 | - name: "Initialization variables" |
| 10 | path: "/root/puppet_variables.json" | 10 | path: "/root/puppet_variables.json" |
| 11 | 11 | ||
| 12 | - name: "Puppet ldap variables" | ||
| 13 | data_hash: ldap_data | ||
| 14 | |||
| 12 | - name: "Per-role environment data" | 15 | - name: "Per-role environment data" |
| 13 | mapped_paths: [ldapvar.self.vars.roles, role, "roles/%{role}.yaml"] | 16 | mapped_paths: [ldapvar.self.vars.roles, role, "roles/%{role}.yaml"] |
| 14 | 17 | ||