merged

templates/puppet.conf.erb

@@ -22,18 +22,26 @@ dbname=<%= scope.lookupvar('puppetmaster_dbname') %>
 dbserver=<%= scope.lookupvar('puppetmaster_dbhost') %>
 dbuser=<%= scope.lookupvar('puppetmaster_dbuser') %>
 dbpassword=<%= scope.lookupvar('puppetmaster_dbpassword') %>
+hiera_config=/etc/puppet/hiera.yaml
+<% end -%>
 
+<% if server == "true" -%>
 [master]
 ssl_client_header = SSL_CLIENT_S_DN
 ssl_client_verify_header = SSL_CLIENT_VERIFY
-reports=<%= scope.lookupvar('puppetmaster_reports') %>
-<% if scope.lookupvar('puppetmaster_reporturl') != false -%>
-reporturl=<%= scope.lookupvar('puppetmaster_reporturl') %>
+<% if scope['puppet::dns_alt_names'] -%>
+dns_alt_names=<%= scope['puppet::dns_alt_names'] %>
+<% end -%> 
+<% if scope['puppet::reports'] -%>
+reports=<%= scope['puppet::reports'] %>
 <% end -%>
-modulepath=<%= scope.lookupvar('puppetmaster_modulepath') %>
-storeconfigs=true
-rails_loglevel=info
+basemodulepath=<%= scope['puppet::basemodulepath'] %>
+storeconfigs=<%= scope['puppet::storeconfigs'] %>
+<% if scope['puppet::storeconfigs_backend'] -%>
+storeconfigs_backend=<%= scope['puppet::storeconfigs_backend'] %>
 <% end -%>
+<% end -%>
+hiera_config=/etc/puppet/hiera.yaml
 
 [agent]
 # Make sure all log messages are sent to the right directory
@@ -43,3 +51,4 @@ splay=true
 report=true
 server=<%= scope.lookupvar("puppetmaster_server") %>
 configtimeout=720
+environment=<%= @environment %>