From: Stephen Gran <steve@lobefin.net>
Date: Sat, 26 Dec 2009 20:25:06 +0000 (+0000)
Subject: Merge branch 'master' into staging
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=f03fa325338ec91f512601b63dca9470535f505c;hp=f4702fedb73ca0c0d70cc2054a64c4523d26c781;p=mirror%2Fdsa-puppet.git

Merge branch 'master' into staging
---

diff --git a/files/etc/puppet/puppet.conf b/files/etc/puppet/puppet.conf
index 732dfffc7..1a8394691 100644
--- a/files/etc/puppet/puppet.conf
+++ b/files/etc/puppet/puppet.conf
@@ -10,10 +10,20 @@ 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
 libdir=/etc/puppet/lib
+environments = development,testing,production,staging
 
 [puppetd]
 environments = development,testing,production,staging
+
+[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
diff --git a/fileserver.conf b/fileserver.conf
index 3b6b79547..2cd7c25de 100644
--- a/fileserver.conf
+++ b/fileserver.conf
@@ -1,3 +1,8 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
 # This file consists of arbitrarily named sections/modules
 # defining where files are served from and to whom