Merge branch 'new_node'

[perso/Immae/Projets/Puppet.git] / modules / base_installation / templates / puppet / puppet.conf.erb

diff --git a/modules/base_installation/templates/puppet/puppet.conf.erb b/modules/base_installation/templates/puppet/puppet.conf.erb
index 3748039e7e3c4879e672a9aba9f9c5ccf045a3ba..24e67c85c4d5c697f3365640e62c6fa5c9b338b5 100644 (file)
--- a/modules/base_installation/templates/puppet/puppet.conf.erb
+++ b/modules/base_installation/templates/puppet/puppet.conf.erb
@@ -1,8 +1,10 @@
 [main]
 ssldir = <%= @puppet_ssl_path %>
 
+environment = <%= @environment %>
+
 node_terminus = ldap
-certname = <%= @system_hostname %>
+certname = <%= @real_hostname %>
 ldapserver = <%= @ldap_server %>
 ldaptls = true
 ldapbase = <%= @ldap_base %>