correct modulepath

[dsa-puppet.git] / modules / debian-org / templates / puppet.conf.erb

diff --git a/modules/debian-org/templates/puppet.conf.erb b/modules/debian-org/templates/puppet.conf.erb
index db558f0a4cccf78ccf23a62a8c65e2af2809ba4b..11546ebebfdc5f2037e533268ec9e36ea7151212 100644 (file)
--- a/modules/debian-org/templates/puppet.conf.erb
+++ b/modules/debian-org/templates/puppet.conf.erb
@@ -10,6 +10,7 @@ ssldir=/var/lib/puppet/ssl
 rundir=/var/run/puppet
 factpath=$vardir/lib/facter
 pluginsync=true
+modulepath=/etc/puppet/modules:/etc/puppet/3rdparty/modules:/usr/share/puppet/modules
 # This is the default environment for all clients
 environment=production
 
@@ -19,6 +20,11 @@ environments = development,testing,production,staging
 reports = store, http
 reporturl = http://puppet-dashboard.debian.org:3000/reports/upload
 config_version = cat /etc/puppet/.config-version
+thin_storeconfigs = true
+dbadapter=mysql
+dbuser=puppet
+dbpassword=<%= scope.lookupvar('dbpassword') %>
+dbserver=localhost
 <%- end -%>
 
 [agent]