Move external modules to other place

[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 99d9fc327117442989db50edacfde1ea647325d4..03b33bba119d8fedbf9e3c4947648d486dae3708 100644 (file)
--- a/modules/base_installation/templates/puppet/puppet.conf.erb
+++ b/modules/base_installation/templates/puppet/puppet.conf.erb
@@ -1,7 +1,18 @@
 [main]
+<% if @xmpp.count > 0 %>
+reports = store,xmpp
+<% else %>
+reports = store
+<% end %>
+
+basemodulepath = <%= @puppet_code_path %>/modules:<%= @puppet_code_path %>/external_modules
+
 ssldir = <%= @puppet_ssl_path %>
 
+environment = <%= @environment %>
+
 node_terminus = ldap
+certname = <%= @real_hostname %>
 ldapserver = <%= @ldap_server %>
 ldaptls = true
 ldapbase = <%= @ldap_base %>