X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Ftemplates%2Fpuppet.conf.erb;h=3ac67f1e164e8d03a3535fec0cd8a8983c2a8ca8;hb=daed7344c1cbc184b16009dc91b3cda8cc14a446;hp=67a4d49e2392f9d6f7dbe143458c16be852aec26;hpb=2eaab21ba472e71a1ed50a45eec4a4bff7e48baa;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/templates/puppet.conf.erb b/modules/debian-org/templates/puppet.conf.erb
index 67a4d49e2..3ac67f1e1 100644
--- a/modules/debian-org/templates/puppet.conf.erb
+++ b/modules/debian-org/templates/puppet.conf.erb
@@ -19,16 +19,17 @@ environments = development,testing,production,staging
 reports = store, http
 reporturl = http://puppet-dashboard.debian.org:3000/reports/upload
 config_version = cat /etc/puppet/.config-version
-storeconfigs = true
+thin_storeconfigs = true
 dbadapter=mysql
 dbuser=puppet
-dbpassword=Oof0shee6Athoesh
+dbpassword=<%= scope.lookupvar('dbpassword') %>
 dbserver=localhost
 <%- end -%>
 
 [agent]
 environments = development,testing,production,staging
 report = true
+configtimeout = 240
 
 [staging]
 manifestdir=/srv/puppet.debian.org/stages/staging/manifests