aboutsummaryrefslogtreecommitdiff
path: root/modules/base_installation/templates
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2017-09-10 12:45:41 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2017-09-10 21:39:23 +0200
commit503e4cf5c54e3fe4b802038e8917341c4ce803e5 (patch)
treeef5bbfe815a9a63487e3b68f957b8ff88aca8e2e /modules/base_installation/templates
parent945ae444952f3322c4687059f0ba6b7308750feb (diff)
downloadPuppet-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.erb1
-rw-r--r--modules/base_installation/templates/puppet/puppet.conf.erb1
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 @@
2ldapadd -D "cn=root,<%= @ldap_base %>" -W << 'EOF' 2ldapadd -D "cn=root,<%= @ldap_base %>" -W << 'EOF'
3dn: <%= @ldap_dn %> 3dn: <%= @ldap_dn %>
4cn: <%= @ldap_cn %> 4cn: <%= @ldap_cn %>
5cn: <%= @system_hostname %>
5objectclass: device 6objectclass: device
6objectclass: top 7objectclass: top
7objectclass: simpleSecurityObject 8objectclass: 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 @@
2ssldir = <%= @puppet_ssl_path %> 2ssldir = <%= @puppet_ssl_path %>
3 3
4node_terminus = ldap 4node_terminus = ldap
5certname = <%= @system_hostname %>
5ldapserver = <%= @ldap_server %> 6ldapserver = <%= @ldap_server %>
6ldaptls = true 7ldaptls = true
7ldapbase = <%= @ldap_base %> 8ldapbase = <%= @ldap_base %>