X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fbase_installation%2Ftemplates%2Fpuppet%2Fpuppet.conf.erb;h=da394686c7aa97f626c32f63fedf95ecf3df9907;hb=c8511b2019b44360887d33a9626ec14c81736aee;hp=3748039e7e3c4879e672a9aba9f9c5ccf045a3ba;hpb=503e4cf5c54e3fe4b802038e8917341c4ce803e5;p=perso%2FImmae%2FProjets%2FPuppet.git

diff --git a/modules/base_installation/templates/puppet/puppet.conf.erb b/modules/base_installation/templates/puppet/puppet.conf.erb
index 3748039..da39468 100644
--- a/modules/base_installation/templates/puppet/puppet.conf.erb
+++ b/modules/base_installation/templates/puppet/puppet.conf.erb
@@ -1,8 +1,23 @@
 [main]
+<%
+  reports = ["store"]
+  if @xmpp.count > 0
+    reports << "xmpp"
+  end
+  if @slack.count > 0
+    reports << "slack"
+  end
+%>
+reports = <%= reports.join(",") %>
+
+basemodulepath = <%= @puppet_code_path %>/modules:<%= @puppet_code_path %>/external_modules
+
 ssldir = <%= @puppet_ssl_path %>
 
+environment = <%= @environment %>
+
 node_terminus = ldap
-certname = <%= @system_hostname %>
+certname = <%= @real_hostname %>
 ldapserver = <%= @ldap_server %>
 ldaptls = true
 ldapbase = <%= @ldap_base %>