refactoring, part 1

templates/puppet.conf.erb

@@ -10,30 +10,33 @@ rundir=/var/run/puppet
 factsignore = .svn CVS .git
 pluginsync=true
 factpath=$vardir/lib/facter
-templatedir=/etc/puppet/templates
-## should we use this?
-#prerun_command=/etc/puppet/etckeeper-commit-pre
-#postrun_command=/etc/puppet/etckeeper-commit-post
-
 
 <% if (fqdn == scope.lookupvar("puppetmaster_server")) || (fqdn == scope.lookupvar("puppetmasterdev_server")) -%>
-dbmigrate=true
-dbadapter=<%= scope.lookupvar('puppetmaster_dbtype') %>
-dbname=<%= scope.lookupvar('puppetmaster_dbname') %>
-dbserver=<%= scope.lookupvar('puppetmaster_dbhost') %>
-dbuser=<%= scope.lookupvar('puppetmaster_dbuser') %>
-dbpassword=<%= scope.lookupvar('puppetmaster_dbpassword') %>
+#dbmigrate=true
+#dbadapter=<%= scope.lookupvar('puppetmaster_dbtype') %>
+#dbname=<%= scope.lookupvar('puppetmaster_dbname') %>
+#dbserver=<%= scope.lookupvar('puppetmaster_dbhost') %>
+#dbuser=<%= scope.lookupvar('puppetmaster_dbuser') %>
+#dbpassword=<%= scope.lookupvar('puppetmaster_dbpassword') %>
 
 [master]
 ssl_client_header = SSL_CLIENT_S_DN
 ssl_client_verify_header = SSL_CLIENT_VERIFY
-reports=<%= scope.lookupvar('puppetmaster_reports') %>
+<% if scope.lookupvar('puppet::puppetmaster::dns_alt_names') -%>
+dns_alt_names=<%= scope.lookupvar('puppet::puppetmaster::dns_alt_names') %>
+<% end -%> 
+<% if @reports -%>
+reports=<%= @reports %>
+<% end -%>
 <% if scope.lookupvar('puppetmaster_reporturl') != false -%>
 reporturl=<%= scope.lookupvar('puppetmaster_reporturl') %>
 <% end -%>
-modulepath=<%= scope.lookupvar('puppetmaster_modulepath') %>
-storeconfigs=true
-rails_loglevel=info
+modulepath=<%= scope['puppet::puppetmaster::modulepath'] %>
+storeconfigs=<%= scope['puppet::puppetmaster::storeconfigs'] %>
+<% if scope['puppet::puppetmaster::storeconfigs_backend'] -%>
+storeconfigs_backend=<%= scope['puppet::puppetmaster::storeconfigs_backend'] %>
+<% end -%>
+#rails_loglevel=info
 <% end -%>
 
 [agent]