X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Ffiles%2Fpuppet.conf;h=bc4b7176433d7d6977f1a0393c9a30036542aa55;hb=34ffa51d586aa81dd7223483a6ab282fdd27b5b1;hp=ee7cd93f6d8a878593cc4168ee8acd186e1d6533;hpb=fe4a49bcab3b096d08de2a03c9b2106acab23bc2;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/files/puppet.conf b/modules/debian-org/files/puppet.conf
index ee7cd93f6..bc4b71764 100644
--- a/modules/debian-org/files/puppet.conf
+++ b/modules/debian-org/files/puppet.conf
@@ -13,21 +13,17 @@ pluginsync=true
 # This is the default environment for all clients
 environment=production
 
-[puppetmasterd]
-templatedir=/etc/puppet/templates
-#libdir=/etc/puppet/lib
+[master]
 environments = development,testing,production,staging
 reports = store, http
 reporturl = http://puppet-dashboard.debian.org:3000/reports/upload
 config_version = cat /etc/puppet/.config-version
 
-[puppetd]
+[agent]
 environments = development,testing,production,staging
 report = true
 
 [staging]
-libdir=/etc/puppet/lib
 manifestdir=/srv/puppet.debian.org/stages/staging/manifests
-templatedir=/srv/puppet.debian.org/stages/staging/templates
 fileserverconfig=/srv/puppet.debian.org/stages/staging/fileserver.conf
 modulepath=/srv/puppet.debian.org/stages/staging/modules