From: Ismaël Bouya Date: Mon, 25 Jun 2018 21:29:44 +0000 (+0200) Subject: Merge branch 'real_hostname' into dev X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=d60467e093d6cf1170a9cbbc5c03b80b8ec1da4a;hp=35fcf209830771fd3d9243ace3bb123fdf643b8e;p=perso%2FImmae%2FProjets%2FPuppet.git Merge branch 'real_hostname' into dev --- 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 <% unless @ips["v6"].nil? -%>ipHostNumber: <%= @ips["v6"]["ipAddress"] %>/<%= @ips["v6"]["mask"] %><%- end %> <%- end -%> environment: <%= @environment %> +puppetVar: real_hostname=<%= @real_hostname %> userpassword: {SSHA}<%= Base64.encode64(Digest::SHA1.digest(@ldap_password+@ssha_ldap_seed)+@ssha_ldap_seed).chomp! %> EOF #### Or modify an existing entry: