reorder hardware modules

[mirror/dsa-puppet.git] / modules / debian-org / files / puppet.conf

diff --git a/modules/debian-org/files/puppet.conf b/modules/debian-org/files/puppet.conf
index 4770647..bc4b717 100644 (file)
--- a/modules/debian-org/files/puppet.conf
+++ b/modules/debian-org/files/puppet.conf
@@ -8,22 +8,22 @@ logdir=/var/log/puppet
 vardir=/var/lib/puppet
 ssldir=/var/lib/puppet/ssl
 rundir=/var/run/puppet
-factpath=$vardir/facts
+factpath=$vardir/lib/facter
 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