redoing older doings

templates/puppet.conf.erb

@@ -1,4 +1,4 @@
-# $Id: puppet.conf.erb 4356 2011-05-28 15:15:01Z uwaechte $
+#### PUPPET MANAGED #####
 
 [main]
 confdir=/etc/puppet
@@ -17,26 +17,18 @@ templatedir=/etc/puppet/templates
 
 
 <% if (fqdn == scope.lookupvar("puppetmaster_server")) || (fqdn == scope.lookupvar("puppetmasterdev_server")) -%>
-#queue_type = stomp
-#queue_source = stomp://localhost:61613
-#dbadapter=sqlite3
 dbmigrate=true
-dbadapter=mysql
-dbname=puppet_master
-dbserver=mysql-i.intern.maketank.net
-dbuser=puppet
-dbpassword=masterClaster2011
+dbadapter=<%= scope.lookupvar('puppetmaster_dbtype') %>
+dbname=<%= scope.lookupvar('puppetmaster_db') %>
+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
-#catalog_format=marshal
-#reports=store,http
-# store only to dashboard
-reports=http
-reporturl=<%= puppetdashboard_reporturl %>
-modulepath=/etc/puppet/modules:/etc/puppet/modules-enabled:/etc/puppet/modules-external:/etc/puppet/modules-public
-#async_storeconfigs=true
+reports=foreman
+modulepath=<%= scope.lookupvar('puppetmaster_modulepath') %>
 storeconfigs=true
 rails_loglevel=info
 dbconnections=20