sudo: replace debbits by publicity

[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 915b83c43dc9f6d8c2cf459ef3498bd9fce55be4..d41e2a01a10a9ae47fd4da5e1293fc99087b3cc9 100644 (file)
--- a/modules/debian-org/templates/puppet.conf.erb
+++ b/modules/debian-org/templates/puppet.conf.erb
@@ -16,9 +16,8 @@ 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
@@ -33,6 +32,11 @@ 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