try to make staging work

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/files/etc/puppet/puppet.conf b/files/etc/puppet/puppet.conf
index 1e3776ffa7e22146ca160076698b17dbdf3f39d4..d0ac184b5b4e4126610fa381bcb6bb454e1c9243 100644 (file)
--- a/files/etc/puppet/puppet.conf
+++ b/files/etc/puppet/puppet.conf
@@ -10,6 +10,8 @@ ssldir=/var/lib/puppet/ssl
 rundir=/var/run/puppet
 factpath=$vardir/facts
 pluginsync=true
+# This is the default environment for all clients
+environment=production 
 
 [puppetmasterd]
 templatedir=/etc/puppet/templates
@@ -23,3 +25,5 @@ templatedir=/srv/puppet.debian.org/stages/staging/templates
 libdir=/etc/puppet/lib
 modulepath=/srv/puppet.debian.org/stages/staging/modules
 manifest=/srv/puppet.debian.org/stages/staging/manifests/site.pp
+factpath=/srv/puppet.debian.org/stages/staging/facts
+fileservercfg=/srv/puppet.debian.org/stages/staging/fileserver.conf