diff options
| author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-06-25 23:29:44 +0200 |
|---|---|---|
| committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-06-25 23:29:44 +0200 |
| commit | d60467e093d6cf1170a9cbbc5c03b80b8ec1da4a (patch) | |
| tree | f6e0e86a0fa91f3205c92a56b773dd136082f07f | |
| parent | 35fcf209830771fd3d9243ace3bb123fdf643b8e (diff) | |
| parent | 96cda4dc280242305aba5aa509f95cd981784a22 (diff) | |
| download | Puppet-d60467e093d6cf1170a9cbbc5c03b80b8ec1da4a.tar.gz Puppet-d60467e093d6cf1170a9cbbc5c03b80b8ec1da4a.tar.zst Puppet-d60467e093d6cf1170a9cbbc5c03b80b8ec1da4a.zip | |
Merge branch 'real_hostname' into dev
| -rw-r--r-- | modules/base_installation/templates/puppet/host_ldap.info.erb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/modules/base_installation/templates/puppet/host_ldap.info.erb b/modules/base_installation/templates/puppet/host_ldap.info.erb index 9c79d3c..7afdf2d 100644 --- a/modules/base_installation/templates/puppet/host_ldap.info.erb +++ b/modules/base_installation/templates/puppet/host_ldap.info.erb | |||
| @@ -12,6 +12,7 @@ objectclass: ipHost | |||
| 12 | <% unless @ips["v6"].nil? -%>ipHostNumber: <%= @ips["v6"]["ipAddress"] %>/<%= @ips["v6"]["mask"] %><%- end %> | 12 | <% unless @ips["v6"].nil? -%>ipHostNumber: <%= @ips["v6"]["ipAddress"] %>/<%= @ips["v6"]["mask"] %><%- end %> |
| 13 | <%- end -%> | 13 | <%- end -%> |
| 14 | environment: <%= @environment %> | 14 | environment: <%= @environment %> |
| 15 | puppetVar: real_hostname=<%= @real_hostname %> | ||
| 15 | userpassword: {SSHA}<%= Base64.encode64(Digest::SHA1.digest(@ldap_password+@ssha_ldap_seed)+@ssha_ldap_seed).chomp! %> | 16 | userpassword: {SSHA}<%= Base64.encode64(Digest::SHA1.digest(@ldap_password+@ssha_ldap_seed)+@ssha_ldap_seed).chomp! %> |
| 16 | EOF | 17 | EOF |
| 17 | [0;35m#### Or modify an existing entry:[0m | 18 | [0;35m#### Or modify an existing entry:[0m |