diff options
| author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-03-19 16:21:00 +0100 |
|---|---|---|
| committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-03-19 16:21:00 +0100 |
| commit | b60b98643a6da52c08ced89779964b722230a7db (patch) | |
| tree | 0cfb28cfd468a5b681f2b5af2b935c81d2221950 /modules/base_installation | |
| parent | 985b53a258ee18eaca8d437ae532c232a6d19921 (diff) | |
| parent | 69da835d04e741f4e85da3c473ba86c8801931fd (diff) | |
| download | Puppet-b60b98643a6da52c08ced89779964b722230a7db.tar.gz Puppet-b60b98643a6da52c08ced89779964b722230a7db.tar.zst Puppet-b60b98643a6da52c08ced89779964b722230a7db.zip | |
Merge branch 'split_scripts' into dev
Diffstat (limited to 'modules/base_installation')
| -rw-r--r-- | modules/base_installation/templates/puppet/host_ldap.info.erb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/modules/base_installation/templates/puppet/host_ldap.info.erb b/modules/base_installation/templates/puppet/host_ldap.info.erb index a71c6f3..9c79d3c 100644 --- a/modules/base_installation/templates/puppet/host_ldap.info.erb +++ b/modules/base_installation/templates/puppet/host_ldap.info.erb | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #### Please add this node to LDAP: | 1 | [0;35m#### Please add this node to LDAP:[0m |
| 2 | ldapadd -D "cn=root,<%= @ldap_base %>" -W << 'EOF' | 2 | ldapadd -D "cn=root,<%= @ldap_base %>" -W << 'EOF' |
| 3 | dn: <%= @ldap_dn %> | 3 | dn: <%= @ldap_dn %> |
| 4 | cn: <%= @ldap_cn %> | 4 | cn: <%= @ldap_cn %> |
| @@ -14,12 +14,13 @@ objectclass: ipHost | |||
| 14 | environment: <%= @environment %> | 14 | environment: <%= @environment %> |
| 15 | userpassword: {SSHA}<%= Base64.encode64(Digest::SHA1.digest(@ldap_password+@ssha_ldap_seed)+@ssha_ldap_seed).chomp! %> | 15 | userpassword: {SSHA}<%= Base64.encode64(Digest::SHA1.digest(@ldap_password+@ssha_ldap_seed)+@ssha_ldap_seed).chomp! %> |
| 16 | EOF | 16 | EOF |
| 17 | #### Or modify an existing entry: | 17 | [0;35m#### Or modify an existing entry:[0m |
| 18 | ldapmodify -D "cn=root,<%= @ldap_base %>" -W << 'EOF' | 18 | ldapmodify -D "cn=root,<%= @ldap_base %>" -W << 'EOF' |
| 19 | dn: <%= @ldap_dn %> | 19 | dn: <%= @ldap_dn %> |
| 20 | changetype: modify | 20 | changetype: modify |
| 21 | replace: userPassword | 21 | replace: userPassword |
| 22 | userpassword: {SSHA}<%= Base64.encode64(Digest::SHA1.digest(@ldap_password+@ssha_ldap_seed)+@ssha_ldap_seed).chomp! %> | 22 | userpassword: {SSHA}<%= Base64.encode64(Digest::SHA1.digest(@ldap_password+@ssha_ldap_seed)+@ssha_ldap_seed).chomp! %> |
| 23 | - | ||
| 23 | replace: environment | 24 | replace: environment |
| 24 | environment: <%= @environment %> | 25 | environment: <%= @environment %> |
| 25 | <%- unless @ips.empty? -%> | 26 | <%- unless @ips.empty? -%> |