diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2017-09-10 12:45:41 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2017-09-10 21:39:23 +0200 |
commit | 503e4cf5c54e3fe4b802038e8917341c4ce803e5 (patch) | |
tree | ef5bbfe815a9a63487e3b68f957b8ff88aca8e2e /modules/base_installation/templates | |
parent | 945ae444952f3322c4687059f0ba6b7308750feb (diff) | |
download | Puppet-503e4cf5c54e3fe4b802038e8917341c4ce803e5.tar.gz Puppet-503e4cf5c54e3fe4b802038e8917341c4ce803e5.tar.zst Puppet-503e4cf5c54e3fe4b802038e8917341c4ce803e5.zip |
Make use of LDAP variables to configure node
Diffstat (limited to 'modules/base_installation/templates')
-rw-r--r-- | modules/base_installation/templates/puppet/host_ldap.info.erb | 1 | ||||
-rw-r--r-- | modules/base_installation/templates/puppet/puppet.conf.erb | 1 |
2 files changed, 2 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 a350c37..f742da7 100644 --- a/modules/base_installation/templates/puppet/host_ldap.info.erb +++ b/modules/base_installation/templates/puppet/host_ldap.info.erb | |||
@@ -2,6 +2,7 @@ | |||
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 %> |
5 | cn: <%= @system_hostname %> | ||
5 | objectclass: device | 6 | objectclass: device |
6 | objectclass: top | 7 | objectclass: top |
7 | objectclass: simpleSecurityObject | 8 | objectclass: simpleSecurityObject |
diff --git a/modules/base_installation/templates/puppet/puppet.conf.erb b/modules/base_installation/templates/puppet/puppet.conf.erb index 99d9fc3..3748039 100644 --- a/modules/base_installation/templates/puppet/puppet.conf.erb +++ b/modules/base_installation/templates/puppet/puppet.conf.erb | |||
@@ -2,6 +2,7 @@ | |||
2 | ssldir = <%= @puppet_ssl_path %> | 2 | ssldir = <%= @puppet_ssl_path %> |
3 | 3 | ||
4 | node_terminus = ldap | 4 | node_terminus = ldap |
5 | certname = <%= @system_hostname %> | ||
5 | ldapserver = <%= @ldap_server %> | 6 | ldapserver = <%= @ldap_server %> |
6 | ldaptls = true | 7 | ldaptls = true |
7 | ldapbase = <%= @ldap_base %> | 8 | ldapbase = <%= @ldap_base %> |