add vittoria

[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..d41e2a01a10a9ae47fd4da5e1293fc99087b3cc9 100644 (file)
--- a/modules/debian-org/templates/puppet.conf.erb
+++ b/modules/debian-org/templates/puppet.conf.erb
@@ -10,15 +10,21 @@ 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
 
 <%- if scope.lookupvar('::hostname') == 'handel' -%>
 [master]
-environments = development,testing,production,staging
-reports = store, http
-reporturl = http://puppet-dashboard.debian.org:3000/reports/upload
+environments = production,staging
+reports = store
 config_version = cat /etc/puppet/.config-version
+storeconfigs = true
+thin_storeconfigs = true
+dbadapter=mysql
+dbuser=puppet
+dbpassword=<%= scope.lookupvar('dbpassword') %>
+dbserver=localhost
 <%- end -%>
 
 [agent]
@@ -26,7 +32,12 @@ environments = development,testing,production,staging
 report = true
 configtimeout = 240
 
+[production]
+manifestdir=/srv/puppet.debian.org/stages/production/manifests
+fileserverconfig=/srv/puppet.debian.org/stages/production/fileserver.conf
+modulepath=/srv/puppet.debian.org/stages/production/modules:/srv/puppet.debian.org/stages/production/3rdparty/modules
+
 [staging]
 manifestdir=/srv/puppet.debian.org/stages/staging/manifests
 fileserverconfig=/srv/puppet.debian.org/stages/staging/fileserver.conf
-modulepath=/srv/puppet.debian.org/stages/staging/modules
+modulepath=/srv/puppet.debian.org/stages/staging/modules:/srv/puppet.debian.org/stages/staging/3rdparty/modules